aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-08 16:01:01 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-09 08:23:59 +0300
commit0caf0a0b714e4477594119a5d281b7041d89486e (patch)
treea5083c72d49ae2386e30144b5881f9f315b75342 /puppet/controller.yaml
parent69ea053eeb05378cc6ea84e2481d889fe70e09be (diff)
Move neutron-related options for nova to base profile
Change-Id: I21c09b2b0bad7736f3c84c55bf14ef7986c2d108
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml7
1 files changed, 0 insertions, 7 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 65556df0..0bc62802 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -513,10 +513,6 @@ resources:
params:
CLUSTER: {get_param: MysqlClusterUniquePart}
neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
- neutron_password: {get_param: NeutronPassword}
- neutron_internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] }
- neutron_auth_url: { get_param: [ EndpointMap, KeystoneV3Admin, uri ] }
- nova_internal_url: { get_param: [ EndpointMap, NovaInternal, uri ] }
aodh_internal_url: { get_param: [ EndpointMap, AodhInternal, uri ] }
aodh_public_url: { get_param: [ EndpointMap, AodhPublic, uri ] }
aodh_admin_url: { get_param: [ EndpointMap, AodhAdmin, uri ] }
@@ -741,9 +737,6 @@ resources:
nova::glance_api_servers: {get_input: glance_api_servers}
nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
nova::api::instance_name_template: {get_input: instance_name_template}
- nova::network::neutron::neutron_password: {get_input: neutron_password}
- nova::network::neutron::neutron_url: {get_input: neutron_internal_url}
- nova::network::neutron::neutron_auth_url: {get_input: neutron_auth_url}
nova::vncproxy::host: {get_input: nova_api_network}
nova_enable_db_purge: {get_input: nova_enable_db_purge}