Browse Source

Merge "Replace port 35357 with 5000"

tags/13.1.0
Zuul 1 year ago
parent
commit
061be58267

+ 2
- 2
manifests/keystone/authtoken.pp View File

@@ -14,7 +14,7 @@
14 14
 #
15 15
 # [*auth_url*]
16 16
 #   (Optional) The URL to use for authentication.
17
-#   Defaults to 'http://localhost:35357'.
17
+#   Defaults to 'http://localhost:5000'.
18 18
 #
19 19
 # [*project_name*]
20 20
 #   (Optional) Service project name
@@ -192,7 +192,7 @@
192 192
 class designate::keystone::authtoken(
193 193
   $username                       = 'designate',
194 194
   $password                       = $::os_service_default,
195
-  $auth_url                       = 'http://localhost:35357',
195
+  $auth_url                       = 'http://localhost:5000',
196 196
   $project_name                   = 'services',
197 197
   $user_domain_name               = 'Default',
198 198
   $project_domain_name            = 'Default',

+ 2
- 2
spec/classes/designate_keystone_authtoken_spec.rb View File

@@ -13,7 +13,7 @@ describe 'designate::keystone::authtoken' do
13 13
       it 'configure keystone_authtoken' do
14 14
         is_expected.to contain_designate_config('keystone_authtoken/username').with_value('designate')
15 15
         is_expected.to contain_designate_config('keystone_authtoken/password').with_value('designate_password')
16
-        is_expected.to contain_designate_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
16
+        is_expected.to contain_designate_config('keystone_authtoken/auth_url').with_value('http://localhost:5000')
17 17
         is_expected.to contain_designate_config('keystone_authtoken/project_name').with_value('services')
18 18
         is_expected.to contain_designate_config('keystone_authtoken/user_domain_name').with_value('Default')
19 19
         is_expected.to contain_designate_config('keystone_authtoken/project_domain_name').with_value('Default')
@@ -53,7 +53,7 @@ describe 'designate::keystone::authtoken' do
53 53
           :www_authenticate_uri                 => 'https://10.0.0.1:9999/',
54 54
           :username                             => 'myuser',
55 55
           :password                             => 'mypasswd',
56
-          :auth_url                             => 'https://127.0.0.1:35357',
56
+          :auth_url                             => 'https://127.0.0.1:5000',
57 57
           :project_name                         => 'service_project',
58 58
           :user_domain_name                     => 'domainX',
59 59
           :project_domain_name                  => 'domainX',

Loading…
Cancel
Save