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/services/ironic-api.yaml | |
parent | 2903a9e4cdb55628ecdd76557e9c7814827d04ab (diff) | |
parent | b5a54bf9852ab24c8c7e0501b258b9fa26e2ad01 (diff) |
Merge "Update authtoken parameters to match recent changes"
Diffstat (limited to 'puppet/services/ironic-api.yaml')
-rw-r--r-- | puppet/services/ironic-api.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/puppet/services/ironic-api.yaml b/puppet/services/ironic-api.yaml index e185630e..6b494256 100644 --- a/puppet/services/ironic-api.yaml +++ b/puppet/services/ironic-api.yaml @@ -45,11 +45,11 @@ outputs: # the TFTP server IP in ironic-conductor.yaml as it should not be # the VIP, but rather a real IP of the controller. - ironic::my_ip: {get_param: [EndpointMap, MysqlInternal, host]} - ironic::api::admin_password: {get_param: IronicPassword} - ironic::api::admin_tenant_name: 'service' - ironic::api::admin_user: 'ironic' - ironic::api::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } - ironic::api::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} + ironic::api::authtoken::password: {get_param: IronicPassword} + ironic::api::authtoken::project_name: 'service' + ironic::api::authtoken::username: 'ironic' + ironic::api::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } + ironic::api::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} ironic::api::port: {get_param: [EndpointMap, IronicInternal, port]} # This is used to build links in responses ironic::api::public_endpoint: {get_param: [EndpointMap, IronicPublic, uri_no_suffix]} |