x
/
packstack
Code Issues Proposed changes

Replace deprecated puppet-magnum parameters 

The auth_uri parameter for magnum::keystone::authtoken was deprecated
in [1], so we need to use the new www_authenticate_uri parameter.

While at it, fix some manifest indentations.

[1] - https://review.openstack.org/558435

Change-Id: I88dcda8b784827725abbfd2c29582ce29074352b
Closes-Bug: #1801913
This commit is contained in:
Javier Pena 2018-11-08 11:45:42 +01:00
parent fd11a9d531
commit d5597e765b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packstack/puppet/modules/packstack/manifests/magnum.pp Executable file → Normal file
View File

@ -13,19 +13,19 @@ class packstack::magnum ()
$magnum_port = '9511'
$magnum_url = "${magnum_protocol}://${magnum_host}:$magnum_port/v1"
class { '::magnum::keystone::authtoken':
auth_uri => "${magnum_protocol}://${magnum_host}:5000/v3",
auth_url => "${magnum_protocol}://${magnum_host}:35357",
auth_version => 'v3',
username => 'magnum',
password => hiera('CONFIG_MAGNUM_KS_PW'),
auth_type => 'password',
memcached_servers => "${magnum_host}:11211",
project_name => 'services'
www_authenticate_uri => "${magnum_protocol}://${magnum_host}:5000/v3",
auth_url => "${magnum_protocol}://${magnum_host}:35357",
auth_version => 'v3',
username => 'magnum',
password => hiera('CONFIG_MAGNUM_KS_PW'),
auth_type => 'password',
memcached_servers => "${magnum_host}:11211",
project_name => 'services'
}
class { '::magnum::api':
enabled => true,
host => '0.0.0.0'
enabled => true,
host => '0.0.0.0'
}
class { '::magnum::conductor':
@ -35,7 +35,7 @@ class packstack::magnum ()
}
class { '::magnum::clients':
region_name => hiera('CONFIG_KEYSTONE_REGION')
region_name => hiera('CONFIG_KEYSTONE_REGION')
}
class { '::magnum::certificates':