Browse Source

Remove deprecated rgw keystone params

Removes the parameters for keystone auth
that has been deprecated in last release
and doesn't do anything.

Depends-On: https://review.opendev.org/#/c/679031/
Change-Id: I64af103b93177bff60411ff484aad0f6506a9d13
changes/20/679020/2
Tobias Urdin 3 weeks ago
parent
commit
0377da4e08

+ 0
- 59
manifests/rgw/keystone.pp View File

@@ -59,33 +59,6 @@
59 59
 #   (Optional) Set 'true' for a private tenant for each user.
60 60
 #   Defaults to true
61 61
 #
62
-## DEPRECATED PARAMS
63
-#
64
-# [*rgw_keystone_version*]
65
-#   (Optional) The api version for keystone.
66
-#   Defaults to undef
67
-#
68
-# [*rgw_keystone_admin_token*]
69
-#   (Optional) The keystone admin token.
70
-#   Defaults to undef
71
-#
72
-# [*use_pki*]
73
-#   (Optional) Whether to use PKI related configuration.
74
-#   Defaults to undef
75
-#
76
-# [*rgw_keystone_revocation_interval*]
77
-#   (Optional) Interval to check for expired tokens.
78
-#   Not useful if not using PKI tokens (if not, set to high value).
79
-#   Defaults to undef
80
-#
81
-# [*nss_db_path*]
82
-#   (Optional) Path to NSS < - > keystone tokens db files.
83
-#   Defaults to undef
84
-#
85
-# [*user*]
86
-#   (Optional) User running the web frontend.
87
-#   Defaults to undef
88
-#
89 62
 define ceph::rgw::keystone (
90 63
   $rgw_keystone_admin_domain,
91 64
   $rgw_keystone_admin_project,
@@ -96,38 +69,12 @@ define ceph::rgw::keystone (
96 69
   $rgw_keystone_token_cache_size    = 500,
97 70
   $rgw_s3_auth_use_keystone         = true,
98 71
   $rgw_keystone_implicit_tenants    = true,
99
-  ## DEPRECATED PARAMS
100
-  $rgw_keystone_version             = undef,
101
-  $rgw_keystone_admin_token         = undef,
102
-  $use_pki                          = undef,
103
-  $rgw_keystone_revocation_interval = undef,
104
-  $nss_db_path                      = undef,
105
-  $user                             = undef,
106 72
 ) {
107 73
 
108 74
   unless $name =~ /^radosgw\..+/ {
109 75
     fail("Define name must be started with 'radosgw.'")
110 76
   }
111 77
 
112
-  if $rgw_keystone_version {
113
-    warning('ceph::rgw::keystone::rgw_keystone_version is deprecated')
114
-  }
115
-  if $rgw_keystone_admin_token {
116
-    warning('ceph::rgw::keystone::rgw_keystone_admin_token is deprecated')
117
-  }
118
-  if $use_pki {
119
-    warning('ceph::rgw::keystone::use_pki is deprecated')
120
-  }
121
-  if $rgw_keystone_revocation_interval {
122
-    warning('ceph::rgw::keystone::rgw_keystone_revocation_interval is deprecated')
123
-  }
124
-  if $nss_db_path {
125
-    warning('ceph::rgw::keystone::nss_db_path is deprecated')
126
-  }
127
-  if $user {
128
-    warning('ceph::rgw::keystone::user is deprecated')
129
-  }
130
-
131 78
   ceph_config {
132 79
     "client.${name}/rgw_keystone_url":              value => $rgw_keystone_url;
133 80
     "client.${name}/rgw_keystone_accepted_roles":   value => join(any2array($rgw_keystone_accepted_roles), ',');
@@ -150,11 +97,5 @@ define ceph::rgw::keystone (
150 97
     "client.${name}/rgw_keystone_admin_project":  value => $rgw_keystone_admin_project;
151 98
     "client.${name}/rgw_keystone_admin_user":     value => $rgw_keystone_admin_user;
152 99
     "client.${name}/rgw_keystone_admin_password": value => $rgw_keystone_admin_password;
153
-    "client.${name}/rgw_keystone_admin_token":    ensure => absent;
154
-  }
155
-
156
-  ceph_config {
157
-    "client.${name}/nss_db_path":                      ensure => absent;
158
-    "client.${name}/rgw_keystone_revocation_interval": ensure => absent;
159 100
   }
160 101
 }

+ 6
- 0
releasenotes/notes/remove-deprecated-85264ba9b0f06420.yaml View File

@@ -0,0 +1,6 @@
1
+---
2
+upgrade:
3
+  - |
4
+    The deprecated parameters rgw_keystone_version, rgw_keystone_admin_token,
5
+    use_pki, rgw_keystone_revocation_interval, nss_db_path and user in
6
+    ceph::rgw::keystone is removed.

+ 0
- 6
spec/defines/ceph_rgw_keystone_spec.rb View File

@@ -47,14 +47,11 @@ describe 'ceph::rgw::keystone' do
47 47
       it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_admin_project').with_value('openstack') }
48 48
       it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_admin_user').with_value('rgwuser') }
49 49
       it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_admin_password').with_value('123456') }
50
-      it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_admin_token').with_ensure('absent') }
51 50
       it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_url').with_value('http://127.0.0.1:5000') }
52 51
       it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_accepted_roles').with_value('member') }
53 52
       it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_token_cache_size').with_value(500) }
54 53
       it { should contain_ceph_config('client.radosgw.gateway/rgw_s3_auth_use_keystone').with_value(true) }
55 54
       it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_implicit_tenants').with_value(true) }
56
-      it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_revocation_interval').with_ensure('absent') }
57
-      it { should contain_ceph_config('client.radosgw.gateway/nss_db_path').with_ensure('absent') }
58 55
     end
59 56
 
60 57
     context 'create with custom params' do
@@ -88,14 +85,11 @@ describe 'ceph::rgw::keystone' do
88 85
       it { should contain_ceph_config('client.radosgw.custom/rgw_keystone_admin_project').with_value('openstack') }
89 86
       it { should contain_ceph_config('client.radosgw.custom/rgw_keystone_admin_user').with_value('rgwuser') }
90 87
       it { should contain_ceph_config('client.radosgw.custom/rgw_keystone_admin_password').with_value('123456') }
91
-      it { should contain_ceph_config('client.radosgw.custom/rgw_keystone_admin_token').with_ensure('absent') }
92 88
       it { should contain_ceph_config('client.radosgw.custom/rgw_keystone_url').with_value('http://keystone.custom:5000') }
93 89
       it { should contain_ceph_config('client.radosgw.custom/rgw_keystone_accepted_roles').with_value('_role1_,role2') }
94 90
       it { should contain_ceph_config('client.radosgw.custom/rgw_keystone_token_cache_size').with_value(100) }
95 91
       it { should contain_ceph_config('client.radosgw.custom/rgw_s3_auth_use_keystone').with_value(false) }
96 92
       it { should contain_ceph_config('client.radosgw.custom/rgw_keystone_implicit_tenants').with_value(false) }
97
-      it { should contain_ceph_config('client.radosgw.custom/rgw_keystone_revocation_interval').with_ensure('absent') }
98
-      it { should contain_ceph_config('client.radosgw.custom/nss_db_path').with_ensure('absent') }
99 93
     end
100 94
   end
101 95
 

Loading…
Cancel
Save