diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-25 10:38:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-25 10:38:25 +0000 |
| commit | 213099a681a2649612adc7f6df6c37d40c47a8e6 (patch) | |
| tree | cab0e6b5165756bb3eccc482a2541816c1e8be3a /puppet/controller.yaml | |
| parent | 2903a9e4cdb55628ecdd76557e9c7814827d04ab (diff) | |
| parent | b5a54bf9852ab24c8c7e0501b258b9fa26e2ad01 (diff) | |
Merge "Update authtoken parameters to match recent changes"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index a9e0c18e..1b2706ea 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -605,11 +605,8 @@ resources: # Nova nova::upgrade_level_compute: {get_input: upgrade_level_nova_compute} nova::use_ipv6: {get_input: nova_ipv6} - nova::api::auth_uri: {get_input: keystone_auth_uri} - nova::api::identity_uri: {get_input: keystone_identity_uri} nova::api::api_bind_address: {get_input: nova_api_network} nova::api::metadata_listen: {get_input: nova_metadata_network} - nova::api::admin_password: {get_input: nova_password} 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} |