From 0bc1111a2d7dba9593d0a00804dba41d37b15481 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 5 Jan 2018 00:30:14 +0100 Subject: u/fuel: Bump & rebase for MaaS prx et al Change-Id: Ib2fa3af6c1336ad31868a812abe2b8257f69895c Signed-off-by: Alexandru Avadanii --- ...-salt-formulas-Add-enable-armband-formula.patch | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch') diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch index cbb2a90b..9d0c7b38 100644 --- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch @@ -28,8 +28,8 @@ Signed-off-by: Guillermo Herrero Signed-off-by: Charalampos Kominos Signed-off-by: Alexandru Avadanii --- - mcp/config/states/openstack | 2 + mcp/config/states/openstack_ha | 1 + + mcp/config/states/openstack_noha | 2 + mcp/config/states/virtual_control_plane | 1 + .../armband/files/nova-libvirt-aarch64-rollup.diff | 317 +++++++++++++++++++++ mcp/salt-formulas/armband/init.sls | 7 + @@ -45,16 +45,6 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/qemu_efi.sls create mode 100644 mcp/salt-formulas/armband/vgabios.sls -diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack -index 369e165..d2a0b63 100755 ---- a/mcp/config/states/openstack -+++ b/mcp/config/states/openstack -@@ -47,3 +47,5 @@ salt -I 'ceilometer:server' state.sls ceilometer - salt -I 'ceilometer:agent' state.sls ceilometer - - salt -I 'horizon:server' state.sls horizon -+ -+salt -I 'nova:compute' state.sls armband || true diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index fbddc6e..6bad8da 100755 --- a/mcp/config/states/openstack_ha @@ -67,18 +57,28 @@ index fbddc6e..6bad8da 100755 salt -I 'mongodb:server' state.sls mongodb || true wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" +diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha +index 369e165..d2a0b63 100755 +--- a/mcp/config/states/openstack_noha ++++ b/mcp/config/states/openstack_noha +@@ -47,3 +47,5 @@ salt -I 'ceilometer:server' state.sls ceilometer + salt -I 'ceilometer:agent' state.sls ceilometer + + salt -I 'horizon:server' state.sls horizon ++ ++salt -I 'nova:compute' state.sls armband || true diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index b08a31c..5b519be 100755 +index 039673c..9240f76 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -46,6 +46,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ - - salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp +@@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then + fi + # KVM libvirt first, VCP deployment +salt -C 'kvm*' state.sls armband || true wait_for 5 "salt -C 'kvm*' state.sls libvirt" - salt -C '* and not cfg01* and not mas01*' state.apply salt + salt -C 'kvm* or cmp*' state.apply salt diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff new file mode 100644 index 0000000..4d7f04c -- cgit 1.2.3-korg