Skip to content

Commit f3645fe

Browse files
gmaanosgmaanos
committed
Enable SRBAC by default for all services
We are in the process of changing the defaults in each service True and will eventually remove this option entirely. Until that happens, manually force it to True here and remove notes about defaults which are either already out of date or soon will be. Change-Id: Ifd965427dc92db8a590cc3e87e6d6691e11ba344 Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Signed-off-by: Ghanshyam Maan <gmaan.os14@gmail.com>
1 parent ae44a42 commit f3645fe

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

‎lib/cinder‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ CINDER_UPLOAD_OPTIMIZED_BACKENDS=${CINDER_UPLOAD_OPTIMIZED_BACKENDS:-$CINDER_ENA
207207
# Flag to set the oslo_policy.enforce_new_defaults. This is used to switch
208208
# the Volume API policies to use the new defaults.
209209
# CINDER_ENFORCE_SCOPE is a deprecated alias for CINDER_ENFORCE_NEW_DEFAULTS.
210-
CINDER_ENFORCE_NEW_DEFAULTS=$(trueorfalse False CINDER_ENFORCE_NEW_DEFAULTS)
210+
CINDER_ENFORCE_NEW_DEFAULTS=$(trueorfalse True CINDER_ENFORCE_NEW_DEFAULTS)
211211
if [[ -n "${CINDER_ENFORCE_SCOPE}" ]]; then
212-
CINDER_ENFORCE_NEW_DEFAULTS=$(trueorfalse False CINDER_ENFORCE_SCOPE)
212+
CINDER_ENFORCE_NEW_DEFAULTS=$(trueorfalse True CINDER_ENFORCE_SCOPE)
213213
fi
214214

215215
# Functions

‎lib/nova‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ NOVA_ENABLE_CACHE=${NOVA_ENABLE_CACHE:-True}
104104

105105
# Flag to set the oslo_policy.enforce_new_defaults.
106106
# This is used to disable the compute API policies new defaults.
107-
# By Default, it is True.
108107
# For more detail: https://docs.openstack.org/oslo.policy/latest/configuration/index.html#oslo_policy.enforce_new_defaults
109108
# NOVA_ENFORCE_SCOPE is a deprecated alias for NOVA_ENFORCE_NEW_DEFAULTS.
110109
NOVA_ENFORCE_NEW_DEFAULTS=$(trueorfalse True NOVA_ENFORCE_NEW_DEFAULTS)

‎lib/placement‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ PLACEMENT_SERVICE_HOST=${PLACEMENT_SERVICE_HOST:-$SERVICE_HOST}
5151
# Flag to set the oslo_policy.enforce_new_defaults.
5252
# This is used to switch the Placement API policies to the new defaults.
5353
# PLACEMENT_ENFORCE_SCOPE is a deprecated alias for PLACEMENT_ENFORCE_NEW_DEFAULTS.
54-
PLACEMENT_ENFORCE_NEW_DEFAULTS=$(trueorfalse False PLACEMENT_ENFORCE_NEW_DEFAULTS)
54+
PLACEMENT_ENFORCE_NEW_DEFAULTS=$(trueorfalse True PLACEMENT_ENFORCE_NEW_DEFAULTS)
5555
if [[ -n "${PLACEMENT_ENFORCE_SCOPE}" ]]; then
56-
PLACEMENT_ENFORCE_NEW_DEFAULTS=$(trueorfalse False PLACEMENT_ENFORCE_SCOPE)
56+
PLACEMENT_ENFORCE_NEW_DEFAULTS=$(trueorfalse True PLACEMENT_ENFORCE_SCOPE)
5757
fi
5858

5959
# Functions

‎stackrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ fi
165165
# Global option for enforcing new defaults. If enabled, ENFORCE_NEW_DEFAULTS
166166
# overrides each services ${SERVICE}_ENFORCE_SCOPE variables.
167167
# ENFORCE_SCOPE is a deprecated alias for ENFORCE_NEW_DEFAULTS.
168-
ENFORCE_NEW_DEFAULTS=$(trueorfalse False ENFORCE_NEW_DEFAULTS)
168+
ENFORCE_NEW_DEFAULTS=$(trueorfalse True ENFORCE_NEW_DEFAULTS)
169169
if [[ -n "${ENFORCE_SCOPE}" ]]; then
170-
ENFORCE_NEW_DEFAULTS=$(trueorfalse False ENFORCE_SCOPE)
170+
ENFORCE_NEW_DEFAULTS=$(trueorfalse True ENFORCE_SCOPE)
171171
fi
172172

173173
# Devstack supports the use of a global virtualenv. These variables enable

0 commit comments

Comments
 (0)