Revert "Don't run sync in upgrades"

Swift fails to deploy when using >1 storage node. The fact `need_sync`
was being set using information from ansible_local in an effort to
support rolling uprades sometime in the future. Sadly this variable
causes storage nodes to be removed from the key sync which results in a
failed build. If we decide serialized rolling uprades are required for
swift we can revisit this however until then we need to remove this
constraint and ensure we're allowing successfule deployments and
upgrades of swift.

This reverts commit 176452bebf7e1ceabd2cf72a89c558c0fc7f1420.

Change-Id: I21318d7c737c2415ef760b46176c3f9b372bb634
This commit is contained in:
Kevin Carter (cloudnull) 2017-10-30 14:28:26 +00:00
parent ddf6b2c1db
commit 988fea87b5

@ -93,24 +93,10 @@
tags:
- swift-config
# When doing rolling upgrades, we addres a single node at a time
# In these instances, the variables necessary to do sync/key work aren't available,
# nor is the sync/key updating necessary. Thus, skip that work on upgrade.
- name: Check if installing or upgrading
set_fact:
need_sync: True
when:
- ansible_local is defined
- ('swift' not in ansible_local['openstack_ansible'] or
'venv_tag' not in ansible_local['openstack_ansible']['swift'] or
ansible_local['openstack_ansible']['swift']['venv_tag'] == swift_venv_tag)
tags: swift-config
- include: swift_key_setup.yml
static: no
when:
- "swift_do_sync | bool"
- "need_sync is defined"
tags:
- swift-config
@ -118,7 +104,6 @@
static: no
when:
- "swift_do_sync | bool"
- "need_sync is defined"
tags:
- swift-config
- swift-rings