Code Review / armband.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
u/fuel: Bump & rebase for neutron trunk ports
[armband.git] / patches / opnfv-fuel / 0001-mcp-salt-formulas-Add-enable-armband-formula.patch
diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
index be6455a..8be2e80 100644 (file)
--- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
@@ -28,9 +28,9 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/config/states/maas                             |  1 +
  mcp/config/states/openstack                        |  2 +
  mcp/config/states/openstack_ha                     |  1 +
+ mcp/config/states/virtual_control_plane            |  1 +
  ...ate-vga-console-defaults-for-armv7-aarch64.diff | 48 ++++++++++++++++++++++
  ...nova-libvirt-AArch64-ACPI-depends-on-AAVMF.diff | 45 ++++++++++++++++++++
  mcp/salt-formulas/armband/init.sls                 |  6 +++
@@ -47,40 +47,40 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  create mode 100644 mcp/salt-formulas/armband/qemu.sls
  create mode 100644 mcp/salt-formulas/armband/vgabios.sls
 
-diff --git a/mcp/config/states/maas b/mcp/config/states/maas
-index 0d733ba..bfedbae 100755
---- a/mcp/config/states/maas
-+++ b/mcp/config/states/maas
-@@ -85,6 +85,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | 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*' state.apply salt
 diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack
-index eaab135..050b648 100755
+index 19cd417..73983d2 100755
 --- a/mcp/config/states/openstack
 +++ b/mcp/config/states/openstack
-@@ -31,3 +31,5 @@ salt -I 'ceilometer:server' state.sls ceilometer
+@@ -43,3 +43,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
++salt -I 'nova:compute' state.sls armband || true
 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index 8ca76e4..c0b8ee3 100755
+index 9eaa3a1..2439ad6 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
+@@ -52,6 +52,7 @@ salt -I 'neutron:server' state.sls neutron -b 1
  salt -I 'neutron:gateway' state.sls neutron.gateway
 
  salt -I 'nova:compute' state.sls nova
-+salt -I 'nova:compute' state.sls armband
++salt -I 'nova:compute' state.sls armband || true
 
- salt -I 'mongodb:server' state.sls mongodb
- while true; do sleep 5; salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin' && break; done
+ 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/virtual_control_plane b/mcp/config/states/virtual_control_plane
+index 43d1520..88e7080 100755
+--- a/mcp/config/states/virtual_control_plane
++++ b/mcp/config/states/virtual_control_plane
+@@ -34,6 +34,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+
+ salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
+
++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
 diff --git a/mcp/salt-formulas/armband/files/nova-Update-vga-console-defaults-for-armv7-aarch64.diff b/mcp/salt-formulas/armband/files/nova-Update-vga-console-defaults-for-armv7-aarch64.diff
 new file mode 100644
 index 0000000..a5b08da
@@ -137,7 +137,7 @@ index 0000000..a5b08da
 +             video.type = 'vga'
 diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-AArch64-ACPI-depends-on-AAVMF.diff b/mcp/salt-formulas/armband/files/nova-libvirt-AArch64-ACPI-depends-on-AAVMF.diff
 new file mode 100644
-index 0000000..bc3121f
+index 0000000..7c1b78a
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/files/nova-libvirt-AArch64-ACPI-depends-on-AAVMF.diff
 @@ -0,0 +1,45 @@
@@ -171,7 +171,7 @@ index 0000000..bc3121f
 +                 (virt_type == "xen" and guest.os_type == fields.VMMode.HVM)):
 +-            guest.features.append(vconfig.LibvirtConfigGuestFeatureACPI())
 ++            guestarch = libvirt_utils.get_arch(image_meta)
-++            if (guestarch not in (arch.ARMV7, arch.AARCH64) or
+++            if (guestarch not in (fields.Architecture.ARMV7, fields.Architecture.AARCH64) or
 ++                image_meta.properties.get('hw_firmware_type') == 'uefi'):
 ++                    guest.features.append(vconfig.LibvirtConfigGuestFeatureACPI())
 +             guest.features.append(vconfig.LibvirtConfigGuestFeatureAPIC())
@@ -200,7 +200,7 @@ index 0000000..6e7b6ad
 +
 diff --git a/mcp/salt-formulas/armband/libvirt_driver.sls b/mcp/salt-formulas/armband/libvirt_driver.sls
 new file mode 100644
-index 0000000..9bc3c81
+index 0000000..9b47e2f
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/libvirt_driver.sls
 @@ -0,0 +1,11 @@
@@ -214,7 +214,7 @@ index 0000000..9bc3c81
 +  file.patch:
 +  - name: /usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py
 +  - source: salt://armband/files/nova-libvirt-AArch64-ACPI-depends-on-AAVMF.diff
-+  - hash: "7fd76813be226b4b0b731e635a461ead"
++  - hash: "c02969d59f16f57242eb74a75e46b0cf"
 diff --git a/mcp/salt-formulas/armband/nova.sls b/mcp/salt-formulas/armband/nova.sls
 new file mode 100644
 index 0000000..674f371