Merge "[patch] OVS bridges should not use 'auto'"

[fuel.git] / mcp / patches / 0003-maas-region-force-artifact-download.patch

diff --git a/mcp/patches/0003-maas-region-force-artifact-download.patch b/mcp/patches/0003-maas-region-force-artifact-download.patch
index 646bed3..2982f36 100644 (file)
--- a/mcp/patches/0003-maas-region-force-artifact-download.patch
+++ b/mcp/patches/0003-maas-region-force-artifact-download.patch
@@ -1,3 +1,11 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2018 Mirantis Inc., 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
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 Date: Sat, 5 Aug 2017 02:03:01 +0200
 Subject: [PATCH] maas: region: force artifact download
@@ -13,18 +21,50 @@ This fixup should be temporary at best.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
+ maas/files/maas-artifact-sync.sh | 20 ++++++++++++++++++++
+ maas/region.sls                  | 10 +++++++++-
+ 2 files changed, 29 insertions(+), 1 deletion(-)
+ create mode 100644 maas/files/maas-artifact-sync.sh
 
+diff --git a/maas/files/maas-artifact-sync.sh b/maas/files/maas-artifact-sync.sh
+new file mode 100644
+index 0000000..1715c51
+--- /dev/null
++++ b/maas/files/maas-artifact-sync.sh
+@@ -0,0 +1,20 @@
++{%- from "maas/map.jinja" import region with context %}
++#!/bin/bash
++function wait_for {
++  local total_attempts=$1; shift
++  local cmdstr=$@
++  local sleep_time=10
++  echo -e "\n[NOTE] Waiting for cmd to return success: ${cmdstr}\n"
++  for attempt in $(seq "${total_attempts}"); do
++    eval "${cmdstr}" && break || true
++    echo -n '.'; sleep "${sleep_time}"
++  done
++}
++maas login {{ region.admin.username }} \
++  http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < \
++  /var/lib/maas/.maas_credentials || exit 1
++# wait max 5 min for service up, 15 min image download, 5 min region to rack sync
++wait_for 30 "maas opnfv boot-resources import"
++wait_for 90 "! maas opnfv boot-resources is-importing | grep -q 'true'"
++maas opnfv rack-controllers import-boot-images || exit 3
++wait_for 30 "true {%- for arch in region.opnfv_arches.split(' ') %} && test -d /var/lib/maas/boot-resources/current/ubuntu/{{ arch }}{%- endfor %}"
 diff --git a/maas/region.sls b/maas/region.sls
-index d3227ca..8a2243d 100644
+index aed295d..d6d28bb 100644
 --- a/maas/region.sls
 +++ b/maas/region.sls
-@@ -109,11 +109,17 @@
-   cmd.run:
-   - name: "maas-region apikey --username {{ region.admin.username }} > /var/lib/maas/.maas_credentials"
+@@ -161,11 +161,19 @@ maas_login_admin:
+   - onlyif: /bin/false
+   {%- endif %}
 
 +maas_force_artifact_sync:
-+  cmd.run:
-+  - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && while ! grep -qzE '(Unable to probe for DHCP servers|DHCP probe complete).*Rack controller' /var/log/maas/rackd.log; do sleep 5; echo -n '.'; done && maas opnfv boot-resources import && while maas opnfv boot-resources is-importing | grep -q -e 'true'; do sleep 5; echo -n '.'; done && maas opnfv rack-controllers import-boot-images && while ! test -d /var/lib/maas/boot-resources/current/ubuntu; do sleep 5; echo -n '.'; done"
++  cmd.script:
++  - name: salt://maas/files/maas-artifact-sync.sh
++  - template: jinja
++  - shell: /bin/bash
 +  - require:
 +    - cmd: maas_login_admin
 +
@@ -34,6 +74,6 @@ index d3227ca..8a2243d 100644
    - require:
 -    - cmd: maas_login_admin
 +    - cmd: maas_force_artifact_sync
-
- maas_commissioning_scripts:
-   module.run:
+   {%- if grains.get('kitchen-test') %}
+   - onlyif: /bin/false
+   {%- endif %}