Move swift_allow_all_users to role defaults

We currently default swift_allow_all_users in
etc/openstack_deploy/user_variables.yml instead of
playbooks/roles/os_swift/defaults/main.yml.  If a deployer removes this
variable from etc/openstack_deploy/user_variables.yml, the swift
playbook will fail.  This commit moves the variable default to
playbooks/roles/os_swift/defaults/main.yml.

Change-Id: I9a73eda990327bf427f40a13965484fde00cbe21
Closes-Bug: #1424981
This commit is contained in:
Matt Thompson 2015-06-12 10:16:16 +01:00
parent e1862a190b
commit 495f8b31d6
2 changed files with 2 additions and 4 deletions

View File

@ -44,10 +44,6 @@ glance_swift_store_endpoint_type: internalURL
#glance_swift_store_container: "NAME_OF_SWIFT_CONTAINER"
#glance_swift_store_region: "NAME_OF_REGION"
## Swift
# This will allow all users to create containers and upload to swift if set to True
swift_allow_all_users: False
## Apache SSL Settings
# These do not need to be configured unless you're creating certificates for
# services running behind Apache (currently, Horizon and Keystone).

View File

@ -67,6 +67,8 @@ swift_default_host_zone: 0
swift_default_host_region: 1
swift_default_drive_weight: 100
swift_allow_versions: True
# This will allow all users to create containers and upload to swift if set to True
swift_allow_all_users: False
## Swift Auth
swift_service_admin_tenant_name: "service"