summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-07 06:17:04 +0000
committerGerrit Code Review <review@openstack.org>2017-02-07 06:17:04 +0000
commit2a461c49dbc2fbe9eee146407d9916e5d77db90d (patch)
tree3eda91ee2e58d073fc3ba78c6270d29133470a79 /puppet
parentddeafadc49f3d0009c82d5ae2bf898a61424de12 (diff)
parent2afc24096bb68ad7a121bc5133a62a8b56b9ec89 (diff)
Merge "Adds default Keystone region to regionOne Closes-Bug: #1661839"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/ironic-api.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/services/ironic-api.yaml b/puppet/services/ironic-api.yaml
index ff91eb63..bc34b736 100644
--- a/puppet/services/ironic-api.yaml
+++ b/puppet/services/ironic-api.yaml
@@ -25,6 +25,10 @@ parameters:
MonitoringSubscriptionIronicApi:
default: 'overcloud-ironic-api'
type: string
+ KeystoneRegion:
+ type: string
+ default: 'regionOne'
+ description: Keystone region for endpoint
resources:
IronicBase:
@@ -73,6 +77,7 @@ outputs:
ironic::keystone::auth::auth_name: 'ironic'
ironic::keystone::auth::password: {get_param: IronicPassword }
ironic::keystone::auth::tenant: 'service'
+ ironic::keystone::auth::region: {get_param: KeystoneRegion}
mysql:
ironic::db::mysql::password: {get_param: IronicPassword}
ironic::db::mysql::user: ironic