From 8d0731eecbb4c7f78e23c8a7e93004da7593afbe Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 24 Aug 2017 17:10:33 +0200 Subject: p/fuel: Rebase after MaaS retry got upstream Change-Id: I321fcb4aa77ebcb4595a9468c2257fef8b9a8ed6 Signed-off-by: Alexandru Avadanii --- .../0004-mcp-salt-formulas-Add-enable-armband-formula.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 b053b699..82cc1a3e 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 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 -- cgit 1.2.3-korg