From d4a32a5737af8f30213075178b3f66a98f7257b1 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 30 Aug 2017 22:06:23 +0200 Subject: u/fuel: Bump & rebase for salt scripts new repo While at it, drop patch that removes UCA repo in ODL scenario and replace it with a patch that extends arch list for UCA repo for arm64. JIRA: ARMBAND-304 Change-Id: Icd8e4cf8288c3e42915244f40d261ff463f60452 Signed-off-by: Alexandru Avadanii --- .../0004-mcp-salt-formulas-Add-enable-armband-formula.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch') diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch index 1b613a4e..4b427dad 100644 --- a/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch @@ -45,7 +45,7 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/vgabios.sls diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 01f8ee0..2dd62f9 100755 +index 710ec0e..6c2ae04 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -81,6 +81,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected @@ -67,7 +67,7 @@ index eaab135..050b648 100755 + +salt -I 'nova:compute' state.sls armband diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index cc4279c..32b581f 100755 +index fc1fed7..7ba9d82 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -41,6 +41,7 @@ salt -I 'neutron:server' state.sls neutron -b 1 -- cgit 1.2.3-korg