From 618cd7c7265fad962ef907259a8d94373f9f8c17 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 10 Jan 2022 22:57:08 +0900 Subject: [PATCH] Magnum: Use keystone_auth class to set up credential parameters Change-Id: Id4945d93c03c2a397a5759ea77fe1e42bb4f40f2 --- manifests/magnum.pp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/manifests/magnum.pp b/manifests/magnum.pp index debf44c2a..fe4b4b10e 100644 --- a/manifests/magnum.pp +++ b/manifests/magnum.pp @@ -47,12 +47,19 @@ class openstack_integration::magnum ( password => 'a_big_secret', } + class { 'magnum::keystone::keystone_auth': + password => 'a_big_secret', + user_domain_name => 'Default', + project_domain_name => 'Default', + auth_url => $::openstack_integration::config::keystone_admin_uri, + } + class { 'magnum::keystone::authtoken': password => 'a_big_secret', user_domain_name => 'Default', project_domain_name => 'Default', - auth_url => "${::openstack_integration::config::base_url}:35357/v3", - www_authenticate_uri => "${::openstack_integration::config::base_url}:5000/v3", + auth_url => $::openstack_integration::config::keystone_admin_uri, + www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri, memcached_servers => $::openstack_integration::config::memcached_servers, }