openstack/instack-undercloud
Code Issues Proposed changes

Merge "Deploy Mistral with Keystone v3 options (authtoken)"

Browse Source
This commit is contained in:
Jenkins
2017-09-22 09:43:25 +00:00
committed by Gerrit Code Review
parent 83bf89ee59 c0cffaae49
commit 674d304ee7
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@@ -607,11 +607,12 @@ mistral::api::api_workers: "%{::os_workers}"
mistral::rabbit_userid: {{UNDERCLOUD_RABBIT_USERNAME}}
mistral::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
mistral::rabbit_host: "{{LOCAL_IP_WRAPPED}}"
mistral::auth_uri: "%{hiera('keystone_auth_uri')}"
mistral::identity_uri: "%{hiera('keystone_identity_uri')}"
mistral::database_connection: mysql+pymysql://mistral:{{UNDERCLOUD_MISTRAL_PASSWORD}}@{{LOCAL_IP_WRAPPED}}/mistral
mistral::rpc_backend: rabbit
mistral::keystone_password: {{UNDERCLOUD_MISTRAL_PASSWORD}}
mistral::keystone::authtoken::password: {{UNDERCLOUD_MISTRAL_PASSWORD}}
mistral::keystone::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}"
mistral::keystone::authtoken::auth_url: "%{hiera('keystone_identity_uri')}"
mistral::keystone::auth::public_url: {{UNDERCLOUD_ENDPOINT_MISTRAL_PUBLIC}}
mistral::keystone::auth::internal_url: {{UNDERCLOUD_ENDPOINT_MISTRAL_INTERNAL}}
mistral::keystone::auth::admin_url: {{UNDERCLOUD_ENDPOINT_MISTRAL_ADMIN}}
@@ -791,7 +792,7 @@ ironic::service_catalog::project_name: 'service'
ironic::swift::project_name: 'service'
nova::keystone::authtoken::project_name: 'service'
swift::proxy::authtoken::project_name: 'service'
mistral::keystone_tenant: 'service'
mistral::keystone::authtoken::project_name: 'service'
swift::proxy::workers: "%{::os_workers}"
# Options

3
releasenotes/notes/keystone_authtoken-44befee30afcc206.yaml Normal file
View File

@@ -0,0 +1,3 @@
---
features:
- Mistral is now deployed with Keystone v3 options (authtoken).