diff options
| author |   Jiri Stransky <jistr@redhat.com> | 2016-03-08 10:51:31 +0100 |
|---|---|---|
| committer | Jiri Stransky <jistr@redhat.com> | 2016-03-09 15:05:10 +0100 |
| commit | d9ee847ec1d8184dde77e15d33be46c9eae8a421 (patch) | |
| tree | 8705ccc63a27363b5c14bf90cdac527c8a2c37bb | |
| parent | bb05fa304a2eed2caa4840e8039832d369a357f7 (diff) | |
Upgrades: object storage node upgrade fix
The variables in the heredoc should be escaped because they should
evaluate only when the inner script runs, not when the outer "writer"
script runs.
Python-zaqarclient is installed for os-collect-config to work, as we do
on the other node types.
Swift-proxy is removed from list of services to stop/start, as
swift-proxy isn't supposed to run on the swift storage nodes.
Change-Id: I8426b859d11378ebdc3da94dcc090133dab0c628
| -rw-r--r-- | extraconfig/tasks/major_upgrade_object_storage.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extraconfig/tasks/major_upgrade_object_storage.sh b/extraconfig/tasks/major_upgrade_object_storage.sh index 0f6d091e..931f4f42 100644 --- a/extraconfig/tasks/major_upgrade_object_storage.sh +++ b/extraconfig/tasks/major_upgrade_object_storage.sh @@ -14,17 +14,18 @@ cat > $UPGRADE_SCRIPT << ENDOFCAT function systemctl_swift { - action=$1 + action=\$1 for S in openstack-swift-account-auditor openstack-swift-account-reaper openstack-swift-account-replicator openstack-swift-account \ openstack-swift-container-auditor openstack-swift-container-replicator openstack-swift-container-updater openstack-swift-container \ - openstack-swift-object-auditor openstack-swift-object-replicator openstack-swift-object-updater openstack-swift-object openstack-swift-proxy; do - systemctl $action $S + openstack-swift-object-auditor openstack-swift-object-replicator openstack-swift-object-updater openstack-swift-object; do + systemctl \$action \$S done } systemctl_swift stop +yum -y install python-zaqarclient # needed for os-collect-config yum -y update systemctl_swift start |