diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-18 17:19:13 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-18 17:20:18 +0200 |
| commit | cdbb329e8e1f65ae514f058ac4259c580833c30e (patch) | |
| tree | 55ee9d4cdd4175ced7e40d0e2fac4913d01d1ece /patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch | |
| parent | 412d4a7e440c4c8765b50608ad67e8d05c719b56 (diff) | |
p/fuel: Rebase after salt control image update
Change-Id: I362ae48d576b14c87188e88599e0a0542028dcb2
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.patch | 8 |
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 a59df5ce..5001540b 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,17 +36,17 @@ 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 8b59910..3b722ea 100755 +index 7b3bb64..f02fff8 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -42,6 +42,7 @@ salt -C 'mas01*' pillar.item\ - salt -C '* and not cfg01* and not mas01*' saltutil.sync_all +@@ -47,6 +47,7 @@ wait_for "! salt '*' test.ping | fgrep -q 'Not connected'" + salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp +salt -C 'kvm*' state.sls armband salt -C 'kvm*' state.sls libvirt - salt -C '* and not cfg01* and not mas01*' system.reboot + 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 --- a/mcp/config/states/openstack |