diff options
| author |   marios <marios@redhat.com> | 2016-11-02 16:23:30 +0200 |
|---|---|---|
| committer | Marios Andreou <marios@redhat.com> | 2016-11-03 07:33:40 +0000 |
| commit | a7af5b90e4fa432973a7ab2f27df5427387b01c0 (patch) | |
| tree | eeecaf866ef6948da5e3283b745b46307e2a15e7 /extraconfig/tasks | |
| parent | d106161466ca158e4b663a89beda7af1d5b67d72 (diff) | |
Fixup the start of swift services
Seems the conditional has changed and we should pickup the
tripleo::profile::base::swift::storage::enable_swift_storage
hiera data.
After controller nodes are upgraded the swift services were down
even though there was no stand-alone swift node (the current
conditional was failing as that hiera isn't set any more)
Closes-Bug: 1638821
Change-Id: Id1383c1e54f9cae13fd375e90da525230e5d23eb
Diffstat (limited to 'extraconfig/tasks')
| -rwxr-xr-x | extraconfig/tasks/pacemaker_common_functions.sh | 2 |
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 |