From 37614bb1d5c7e4c5d9ad0eec0e94776d09977ed2 Mon Sep 17 00:00:00 2001 From: Matt Thompson Date: Tue, 24 Feb 2015 10:33:46 +0000 Subject: [PATCH] Move swift_hash_path_ variables Currently, swift_hash_path_suffix and swift_hash_path_prefix are placed in user_variables.yml file however they need to be placed in user_secrets.yml in order for pw-token-gen.py (which is run against user_secrets.yml) to generate values for these variables correctly. Change-Id: Ie1bdee3fbfaf627c10f654d30c9b7af67280673f Closes-Bug: 1424979 --- etc/openstack_deploy/user_secrets.yml | 3 +++ etc/openstack_deploy/user_variables.yml | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/openstack_deploy/user_secrets.yml b/etc/openstack_deploy/user_secrets.yml index 0cf4fc7f5b..35b816c828 100644 --- a/etc/openstack_deploy/user_secrets.yml +++ b/etc/openstack_deploy/user_secrets.yml @@ -80,3 +80,6 @@ kibana_password: swift_service_password: swift_container_mysql_password: swift_dispersion_password: +### Once the swift cluster has been setup DO NOT change these hash values! +swift_hash_path_suffix: +swift_hash_path_prefix: diff --git a/etc/openstack_deploy/user_variables.yml b/etc/openstack_deploy/user_variables.yml index 557d3dc4ed..e174045155 100644 --- a/etc/openstack_deploy/user_variables.yml +++ b/etc/openstack_deploy/user_variables.yml @@ -36,8 +36,5 @@ glance_swift_store_endpoint_type: internalURL ## Swift -# Once the swift cluster has been setup DO NOT change these hash values! -swift_hash_path_suffix: -swift_hash_path_prefix: # This will allow all users to create containers and upload to swift if set to True swift_allow_all_users: False