summaryrefslogtreecommitdiffstats
path: root/extraconfig/tasks
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-04 14:08:08 +0000
committerGerrit Code Review <review@openstack.org>2016-11-04 14:08:08 +0000
commit27a9382dd8bd9a070ce102c9b5844c08066c9229 (patch)
tree0dcd4c1abac07977879831543f80a39c020e2d9f /extraconfig/tasks
parent08dfb236329e3adabafacffd30683f7609b5b615 (diff)
parenta7af5b90e4fa432973a7ab2f27df5427387b01c0 (diff)
Merge "Fixup the start of swift services"
Diffstat (limited to 'extraconfig/tasks')
-rwxr-xr-xextraconfig/tasks/pacemaker_common_functions.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/extraconfig/tasks/pacemaker_common_functions.sh b/extraconfig/tasks/pacemaker_common_functions.sh
index 4f17b69a..2c7dfc35 100755
--- a/extraconfig/tasks/pacemaker_common_functions.sh
+++ b/extraconfig/tasks/pacemaker_common_functions.sh
@@ -284,7 +284,7 @@ function systemctl_swift {
services=$(systemctl | grep openstack-swift- | grep running | awk '{print $1}')
;;
start)
- enable_swift_storage=$(hiera -c /etc/puppet/hiera.yaml 'enable_swift_storage')
+ enable_swift_storage=$(hiera -c /etc/puppet/hiera.yaml tripleo::profile::base::swift::storage::enable_swift_storage)
if [[ $enable_swift_storage != "true" ]]; then
services=( openstack-swift-proxy )
fi