diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-08-24 15:41:04 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-08-25 20:27:11 -0400 |
| commit | cf8e3f5034966c9a38456880605a3ef0d277e591 (patch) | |
| tree | 78b9aa441a6103d5127a95917365666cc6cbdc25 /puppet/controller.yaml | |
| parent | a356bb65c9f299fc706cf5e0ec9d9d441ea31046 (diff) | |
Mv keystone, mongo, manila out of controller.yaml
This patch moves keystone, mongodb, and manila
bind host settings out of controller.yaml and into
composable services.
Change-Id: I1874dc47fffa30606107999da702442badde35c9
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 90cb7434..5badb7bc 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -428,10 +428,6 @@ resources: pcsd_password: {get_param: PcsdPassword} enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} glance_api_servers: { get_param: [EndpointMap, GlanceInternal, uri]} - 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]}]} - 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]}]} ceilometer_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]} @@ -514,18 +510,6 @@ resources: corosync_ipv6: {get_input: corosync_ipv6} tripleo::fencing::config: {get_input: fencing_config} - # Keystone - keystone::admin_bind_host: {get_input: keystone_admin_api_network} - keystone::public_bind_host: {get_input: keystone_public_api_network} - 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} - # Neutron neutron::bind_host: {get_input: neutron_api_network} neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip} |