Browse Source

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
Javier Pena 5 months ago
parent
commit
d5597e765b
1 changed files with 11 additions and 11 deletions
  1. 11
    11
      packstack/puppet/modules/packstack/manifests/magnum.pp

+ 11
- 11
packstack/puppet/modules/packstack/manifests/magnum.pp View File

@@ -13,19 +13,19 @@ class packstack::magnum ()
13 13
     $magnum_port = '9511'
14 14
     $magnum_url = "${magnum_protocol}://${magnum_host}:$magnum_port/v1"
15 15
     class { '::magnum::keystone::authtoken':
16
-      auth_uri                             => "${magnum_protocol}://${magnum_host}:5000/v3",
17
-      auth_url                             => "${magnum_protocol}://${magnum_host}:35357",
18
-      auth_version                         => 'v3',
19
-      username                             => 'magnum',
20
-      password                             => hiera('CONFIG_MAGNUM_KS_PW'),
21
-      auth_type                            => 'password',
22
-      memcached_servers                    => "${magnum_host}:11211",
23
-      project_name                         => 'services'
16
+      www_authenticate_uri => "${magnum_protocol}://${magnum_host}:5000/v3",
17
+      auth_url             => "${magnum_protocol}://${magnum_host}:35357",
18
+      auth_version         => 'v3',
19
+      username             => 'magnum',
20
+      password             => hiera('CONFIG_MAGNUM_KS_PW'),
21
+      auth_type            => 'password',
22
+      memcached_servers    => "${magnum_host}:11211",
23
+      project_name         => 'services'
24 24
     }
25 25
 
26 26
     class { '::magnum::api':
27
-      enabled                              => true,
28
-      host                                 => '0.0.0.0'
27
+      enabled => true,
28
+      host    => '0.0.0.0'
29 29
     }
30 30
 
31 31
     class { '::magnum::conductor':
@@ -35,7 +35,7 @@ class packstack::magnum ()
35 35
     }
36 36
 
37 37
     class { '::magnum::clients':
38
-      region_name                          => hiera('CONFIG_KEYSTONE_REGION')
38
+      region_name => hiera('CONFIG_KEYSTONE_REGION')
39 39
     }
40 40
 
41 41
     class { '::magnum::certificates':

Loading…
Cancel
Save