From 60898eef07ae7764e97ab1583e69d5557a8eaf8d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 24 Jan 2022 13:16:40 +0900 Subject: [PATCH] Murano: Use the new separate class for authtoken parameters Depends-on: https://review.opendev.org/826003 Change-Id: I78494570042db73d07da8ec61c47fedae9e89a7e --- manifests/murano.pp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/manifests/murano.pp b/manifests/murano.pp index 07fa83d0e..d4044a7d7 100644 --- a/manifests/murano.pp +++ b/manifests/murano.pp @@ -49,8 +49,12 @@ class openstack_integration::murano { class { 'murano::db': database_connection => 'mysql+pymysql://murano:a_big_secret@127.0.0.1/murano?charset=utf8', } + class { 'murano::keystone::authtoken': + auth_url => $::openstack_integration::config::keystone_admin_uri, + www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri, + password => 'a_big_secret' + } class { 'murano': - admin_password => 'a_big_secret', default_transport_url => os_transport_url({ 'transport' => $::openstack_integration::config::messaging_default_proto, 'host' => $::openstack_integration::config::host, @@ -65,8 +69,6 @@ class openstack_integration::murano { rabbit_own_host => $::openstack_integration::config::host, rabbit_own_port => $::openstack_integration::config::rabbit_port, rabbit_own_use_ssl => $::openstack_integration::config::ssl, - identity_uri => $::openstack_integration::config::keystone_admin_uri, - www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri, use_ssl => $::openstack_integration::config::ssl, service_host => $::openstack_integration::config::ip_for_url, cert_file => $::openstack_integration::params::cert_path,