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-24 17:10:33 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-24 17:11:05 +0200
commit8d0731eecbb4c7f78e23c8a7e93004da7593afbe (patch)
tree3cd9b7079a159801ba072f4f26056bd09b6283b9 /patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch
parentaa6c72b42783a4226c07e0b7af37434f13dc8c64 (diff)
p/fuel: Rebase after MaaS retry got upstream
Change-Id: I321fcb4aa77ebcb4595a9468c2257fef8b9a8ed6 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.patch8
1 files changed, 4 insertions, 4 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 b053b69..82cc1a3 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
@@ -36,10 +36,10 @@ 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 fecd991..85cee8c 100755
+index 31625d8..1e14e5f 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
-@@ -51,6 +51,7 @@ wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'"
+@@ -81,6 +81,7 @@ wait_for 90 "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'"
salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
@@ -48,10 +48,10 @@ index fecd991..85cee8c 100755
salt -C '* and not cfg01* and not mas01*' state.apply salt
diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack
-index 57ca585..23aaf72 100755
+index 5ded58c..270bf35 100755
--- a/mcp/config/states/openstack
+++ b/mcp/config/states/openstack
-@@ -23,3 +23,5 @@ salt -I 'neutron:gateway' state.sls neutron
+@@ -26,3 +26,5 @@ salt -I 'neutron:gateway' state.sls neutron
salt -I 'nova:compute' state.sls nova
salt -I 'horizon:server' state.sls horizon