summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-14 13:40:33 +0000
committerGerrit Code Review <review@openstack.org>2017-02-14 13:40:33 +0000
commitacc903c081f5f26c4681cab15e4c824bf2eeaccb (patch)
tree6727f03a63467040459e7597ba7521a75fddd6f4
parentd6794ec1d30898b25d6c0950bd0e02f3327b2999 (diff)
parentd1edc33b3ce74c19f50591fbb08d7c306cf26ae0 (diff)
Merge "Use Keystone internal endpoint instead of admin for nova-ironic"
-rw-r--r--puppet/services/nova-ironic.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/puppet/services/nova-ironic.yaml b/puppet/services/nova-ironic.yaml
index 306c6b6f..5eb2170a 100644
--- a/puppet/services/nova-ironic.yaml
+++ b/puppet/services/nova-ironic.yaml
@@ -42,10 +42,10 @@ outputs:
- nova::compute::force_config_drive: true
nova::compute::reserved_host_memory: '0'
nova::compute::vnc_enabled: false
- nova::ironic::common::admin_password: {get_param: IronicPassword}
- nova::ironic::common::admin_tenant_name: 'service'
- nova::ironic::common::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri]}
- nova::ironic::common::admin_username: 'ironic'
+ nova::ironic::common::password: {get_param: IronicPassword}
+ nova::ironic::common::project_name: 'service'
+ nova::ironic::common::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
+ nova::ironic::common::username: 'ironic'
nova::ironic::common::api_endpoint: {get_param: [EndpointMap, IronicInternal, uri]}
nova::network::neutron::dhcp_domain: ''
nova::scheduler::filter::scheduler_host_manager: 'ironic_host_manager'