diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-03 16:16:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-03 16:16:24 +0000 |
| commit | 656b4f9887878b6d933311086cf1e2316f5f593a (patch) | |
| tree | 0509e34642c17a5f2be0edf2a777ae6d1090faaa /puppet/controller.yaml | |
| parent | 6d211425d7db5328d94638e7684561ff81b5195f (diff) | |
| parent | b99733d08ae8e90b7ace4c2521ec74f2520dba93 (diff) | |
Merge "Enable Manila integration - as a composable controller service"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 679fd90b..b604ffca 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -586,6 +586,7 @@ resources: keystone_public_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]} keystone_admin_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]} keystone_region: {get_param: KeystoneRegion} + manila_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ManilaApiNetwork]}]} mongo_db_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]} neutron_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]} neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]} @@ -723,6 +724,9 @@ resources: keystone::wsgi::apache::bind_host: {get_input: keystone_public_api_network} keystone::wsgi::apache::admin_bind_host: {get_input: keystone_admin_api_network} + # Manila + manila::api::bind_host: {get_input: manila_api_network} + # MongoDB mongodb::server::bind_ip: {get_input: mongo_db_network} |