Code Review / armband.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
u/fuel: Bump for neutron rootwrap fixup
[armband.git] / patches / opnfv-fuel / 0002-salt-formulas-Add-enable-armband-formula.patch
diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
index e1508ac..c1f1b03 100644 (file)
--- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
@@ -1,5 +1,5 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
+: Copyright (c) 2018 Enea AB and others.
 :
 : All rights reserved. This program and the accompanying materials
 : are made available under the terms of the Apache License, Version 2.0
@@ -26,16 +26,16 @@ 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/openstack_ha                     |  2 +
+ mcp/config/states/openstack_ha                     |  1 +
  mcp/config/states/openstack_noha                   |  2 +
- mcp/config/states/virtual_control_plane            |  2 +
+ mcp/config/states/virtual_control_plane            |  1 +
  .../armband/files/nova-libvirt-aarch64-rollup.diff | 76 ++++++++++++++++++++++
  mcp/salt-formulas/armband/init.sls                 |  7 ++
  mcp/salt-formulas/armband/nova_config.sls          | 35 ++++++++++
  mcp/salt-formulas/armband/nova_libvirt.sls         |  7 ++
  mcp/salt-formulas/armband/qemu_efi.sls             |  2 +
  mcp/salt-formulas/armband/vgabios.sls              |  7 ++
- 9 files changed, 140 insertions(+)
+ 9 files changed, 138 insertions(+)
  create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
  create mode 100644 mcp/salt-formulas/armband/init.sls
  create mode 100644 mcp/salt-formulas/armband/nova_config.sls
@@ -44,44 +44,45 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  create mode 100644 mcp/salt-formulas/armband/vgabios.sls
 
 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index 62a9654..cb7a9c4 100755
+index 4f3760f6..115a56c1 100755
 --- a/mcp/config/states/openstack_ha
 +++ b/mcp/config/states/openstack_ha
-@@ -52,6 +52,8 @@ 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
-+wait_for 10 "! salt -I 'nova:compute' state.sls armband | " \
-+  "tee /dev/stderr | grep -Eq '(Not connected|No response)'"
++wait_for 5.0 "salt -I 'nova:compute' state.sls armband"
 
- salt -I 'mongodb:server' state.sls mongodb || true
- wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
+ salt -C 'I@mongodb:server and *01*' state.sls mongodb || true
+ wait_for 10 "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 0a27876..aa369e8 100755
+index 9fc30bbf..998fc6b4 100755
 --- a/mcp/config/states/openstack_noha
 +++ b/mcp/config/states/openstack_noha
-@@ -48,3 +48,5 @@ salt -I 'ceilometer:server' state.sls ceilometer
- salt -I 'ceilometer:agent' state.sls ceilometer
+@@ -52,6 +52,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer
 
  salt -I 'horizon:server' state.sls horizon
-+
+
 +salt -I 'nova:compute' state.sls armband
++
+ # workaround for the pike horizon is missing css, FUEL-324
+ salt -I 'horizon:server' file.symlink \
+   /var/lib/openstack-dashboard/static \
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index c7768f7..5565fe5 100755
+index 80c0c87e..144245f9 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
-@@ -27,6 +27,8 @@ if [ "${ERASE_ENV}" -eq 1 ]; then
+@@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then
  fi
 
  # KVM libvirt first, VCP deployment
-+wait_for 10 "! salt -C 'kvm*' state.sls armband | " \
-+  "tee /dev/stderr | grep -Eq '(Not connected|No response)'"
- wait_for 5 "salt -C 'kvm*' state.sls libvirt"
++wait_for 5.0 "salt -C 'kvm*' state.sls armband"
+ wait_for 5.0 "salt -C 'kvm*' state.sls libvirt"
 
  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..36ddf72
+index 00000000..36ddf72b
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
 @@ -0,0 +1,76 @@
@@ -163,7 +164,7 @@ index 0000000..36ddf72
 +         if image_meta.properties.get('hw_video_model'):
 diff --git a/mcp/salt-formulas/armband/init.sls b/mcp/salt-formulas/armband/init.sls
 new file mode 100644
-index 0000000..8a8cf2a
+index 00000000..8a8cf2ab
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/init.sls
 @@ -0,0 +1,7 @@
@@ -176,7 +177,7 @@ index 0000000..8a8cf2a
 + {%- endif %}
 diff --git a/mcp/salt-formulas/armband/nova_config.sls b/mcp/salt-formulas/armband/nova_config.sls
 new file mode 100644
-index 0000000..31fa031
+index 00000000..31fa031a
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/nova_config.sls
 @@ -0,0 +1,35 @@
@@ -217,7 +218,7 @@ index 0000000..31fa031
 +    - name: "service nova-compute restart"
 diff --git a/mcp/salt-formulas/armband/nova_libvirt.sls b/mcp/salt-formulas/armband/nova_libvirt.sls
 new file mode 100644
-index 0000000..bc2cbda
+index 00000000..bc2cbda9
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/nova_libvirt.sls
 @@ -0,0 +1,7 @@
@@ -230,7 +231,7 @@ index 0000000..bc2cbda
 +  - unless: 'test -f /var/cache/salt/minion/files/base/armband/files/nova-libvirt-aarch64-rollup.diff && cd /usr/lib/python2.7/dist-packages && patch -p1 -R --dry-run /var/cache/salt/minion/files/base/armband/files/nova-libvirt-aarch64-rollup.diff'
 diff --git a/mcp/salt-formulas/armband/qemu_efi.sls b/mcp/salt-formulas/armband/qemu_efi.sls
 new file mode 100644
-index 0000000..c697dae
+index 00000000..c697dae9
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/qemu_efi.sls
 @@ -0,0 +1,2 @@
@@ -238,7 +239,7 @@ index 0000000..c697dae
 +  pkg.installed
 diff --git a/mcp/salt-formulas/armband/vgabios.sls b/mcp/salt-formulas/armband/vgabios.sls
 new file mode 100644
-index 0000000..500c2bc
+index 00000000..500c2bcf
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/vgabios.sls
 @@ -0,0 +1,7 @@