From 902dee384d627fda43b715fc6b47ecd97636c7b8 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 25 Apr 2018 17:50:19 +0200 Subject: Revert "[p/openstack.nova] force creation of pty on aarch64" Now that we added Mirantis MCP repos on cmp nodes for HA scenarios, the recently added patch that reverted Ubuntu specific changes for serial console no longer applies (as Mirantis does not carry those Ubuntu modifications but instead relies on upstream Nova). This, combined with a minor bug in patch applying itself and a legacy leftover that does not check the patch apply return code led to the whole Nova patch to be skipped. - remove pty related patch hunks (revert); - fix `unless` condition for Nova patch apply, as well as Salt minion patch apply; - break `armband` state on patch apply failure; Note that for noHA deploys (where we still use the Ubuntu packages on cmp nodes afair) we will revert to old (no pty) behavior. This reverts commit 093f2b7684c86979dfa6f5f36f28689ca9b3e552. Change-Id: Ib3c1119ab544ba895b2f8d37e0b9542196058993 Signed-off-by: Alexandru Avadanii --- .../0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch') diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 9d420c4f..37fb9dd4 100644 --- a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -161,7 +161,7 @@ index 00000000..9e74c240 + def purge(vm_, dirs=False): diff --git a/mcp/salt-formulas/armband/salt_minion.sls b/mcp/salt-formulas/armband/salt_minion.sls new file mode 100644 -index 00000000..9cce6367 +index 00000000..cc5c9242 --- /dev/null +++ b/mcp/salt-formulas/armband/salt_minion.sls @@ -0,0 +1,7 @@ @@ -171,4 +171,4 @@ index 00000000..9cce6367 + - source: salt://armband/files/salt-minion-aarch64-rollup.diff + - hash: False + - options: '-p1' -+ - unless: 'test -f /var/cache/salt/minion/files/base/armband/files/salt-minion-aarch64-rollup.diff && cd /usr/lib/python2.7/dist-packages && patch -p1 -R --dry-run /var/cache/salt/minion/files/base/armband/files/salt-minion-aarch64-rollup.diff' ++ - unless: 'test -f /var/cache/salt/minion/files/base/armband/files/salt-minion-aarch64-rollup.diff && cd /usr/lib/python2.7/dist-packages && patch -p1 -R --dry-run -r - < /var/cache/salt/minion/files/base/armband/files/salt-minion-aarch64-rollup.diff' -- cgit 1.2.3-korg