From 0cb4fbdad7949b73b692589438d7171dbcdc7aea Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Sat, 10 Dec 2016 16:00:52 -0700 Subject: [PATCH] Switch mistral to use authtoken configuration The upstream mistral puppet module is adding a authtoken specific class for mistral to match all the other services. This change switches to use the new class which should allow for proper keystone v3 support. Change-Id: I3fd172eba736e21d52d92ddad502dee060070ca9 Depends-On: I71969ef09018f9daa5f81c4f3bcbdb0b0974446c --- .../puppet-stack-config/puppet-stack-config.yaml.template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index b9d80b09a..fc2f0252a 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -492,11 +492,12 @@ mistral::api::api_workers: "%{::os_workers}" mistral::rabbit_userid: {{UNDERCLOUD_RABBIT_USERNAME}} mistral::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}} mistral::rabbit_host: {{LOCAL_IP}} -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}}/mistral mistral::rpc_backend: rabbit -mistral::keystone_password: {{UNDERCLOUD_MISTRAL_PASSWORD}} +mistral::keystone::authtoken::project_name: 'service' +mistral::keystone::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}" +mistral::keystone::authtoken::auth_url: "%{hiera('keystone_identity_uri')}" +mistral::keystone::authtoken::password: {{UNDERCLOUD_MISTRAL_PASSWORD}} 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}}