diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-09 08:28:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-09 08:28:18 +0000 |
| commit | adadb2aaa431e5ab8656e3eec46400331172d05e (patch) | |
| tree | f06b410f4ab5bca69bd7e09a68c28215da6b94fe /puppet/controller.yaml | |
| parent | 6bba45ac28b166d69ed1aec1d3381cb56a4bc470 (diff) | |
| parent | b2ea349adbb18bb76188e5293a863a8bd9a9f64e (diff) | |
Merge "Move neutron's kestone::auth parameters to server profile"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index a0ca0a36..c764d34f 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -522,8 +522,6 @@ resources: neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret} neutron_password: {get_param: NeutronPassword} neutron_internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] } - neutron_public_url: { get_param: [ EndpointMap, NeutronPublic, uri ] } - neutron_admin_url: { get_param: [ EndpointMap, NeutronAdmin, 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 ] } @@ -730,11 +728,6 @@ resources: neutron::bind_host: {get_input: neutron_api_network} neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip} neutron::agents::metadata::metadata_ip: {get_input: neutron_api_network} - neutron::keystone::auth::public_url: {get_input: neutron_public_url } - neutron::keystone::auth::internal_url: {get_input: neutron_internal_url } - neutron::keystone::auth::admin_url: {get_input: neutron_admin_url } - neutron::keystone::auth::password: {get_input: neutron_password } - neutron::keystone::auth::region: {get_input: keystone_region} # Aodh aodh::api::host: {get_input: aodh_api_network} |