From b8719a10a611f64a6bdf97e9a16f03de9ae88156 Mon Sep 17 00:00:00 2001 From: zhubingbing Date: Tue, 24 Apr 2018 20:23:40 +0800 Subject: [PATCH] Switch to www_authenticate_uri for ec2api puppet-ec2api switched to www_authenticate_uri in [1], update puppet-openstack-integration for the same. [1] https://review.openstack.org/#/c/558441/ Change-Id: I02f4bf8328bd40a00a1901beb9c55d647cf13543 --- manifests/ec2api.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/ec2api.pp b/manifests/ec2api.pp index ba205a31e..30b543a3d 100644 --- a/manifests/ec2api.pp +++ b/manifests/ec2api.pp @@ -25,9 +25,9 @@ class openstack_integration::ec2api { } class { '::ec2api': } class { '::ec2api::keystone::authtoken': - password => 'a_big_secret', - auth_url => $::openstack_integration::config::keystone_admin_uri, - auth_uri => $::openstack_integration::config::keystone_auth_uri, + password => 'a_big_secret', + auth_url => $::openstack_integration::config::keystone_admin_uri, + www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri, } class { '::ec2api::api': keystone_ec2_tokens_url => "${::openstack_integration::config::keystone_auth_uri}/v3/ec2tokens",