aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-30 22:06:23 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-30 22:16:33 +0200
commitd4a32a5737af8f30213075178b3f66a98f7257b1 (patch)
tree43fe9b5be4f1766e3032bb8e442035fc87d30fb3 /patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch
parentd07736d25fa29b1b45e00750568959bc00a2ee09 (diff)
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch')
-rw-r--r--patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch4
1 files changed, 2 insertions, 2 deletions
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 1b613a4..4b427da 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 <Alexandru.Avadanii@enea.com>
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