diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-09 09:35:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-09 09:35:24 +0000 |
| commit | f730f19f1c1681ae39b9ecd2484356c481c25f96 (patch) | |
| tree | 067a2465d6c35bf01084ff02e2d7777d2a7cff87 /puppet/controller.yaml | |
| parent | 3f69e00ac2bf439bb8f276bd2733bcad1b7e7b4b (diff) | |
| parent | 69ea053eeb05378cc6ea84e2481d889fe70e09be (diff) | |
Merge "Move nova's kestone::auth parameters to API profile"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index c2075e63..816ce71d 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -539,9 +539,6 @@ resources: nova_password: {get_param: NovaPassword} upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute} instance_name_template: {get_param: InstanceNameTemplate} - nova_public_url: {get_param: [EndpointMap, NovaPublic, uri]} - nova_internal_url: {get_param: [EndpointMap, NovaInternal, uri]} - nova_admin_url: {get_param: [EndpointMap, NovaAdmin, uri]} fencing_config: {get_param: FencingConfig} pcsd_password: {get_param: PcsdPassword} rabbit_username: {get_param: RabbitUserName} @@ -750,11 +747,6 @@ resources: 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} - nova::keystone::auth::public_url: {get_input: nova_public_url} - nova::keystone::auth::internal_url: {get_input: nova_internal_url} - nova::keystone::auth::admin_url: {get_input: nova_admin_url} - nova::keystone::auth::password: {get_input: nova_password } - nova::keystone::auth::region: {get_input: keystone_region} # Horizon apache::mod::remoteip::proxy_ips: {get_input: horizon_subnet} |