Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Increasing neutron timeout for low memory usage"
[apex-tripleo-heat-templates.git]
/
extraconfig
/
tasks
/
pacemaker_common_functions.sh
diff --git
a/extraconfig/tasks/pacemaker_common_functions.sh
b/extraconfig/tasks/pacemaker_common_functions.sh
index
4f17b69
..
2c7dfc3
100755
(executable)
--- 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)
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
if [[ $enable_swift_storage != "true" ]]; then
services=( openstack-swift-proxy )
fi