From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Thu, 26 Apr 2018 12:33:16 +0000 (+0400)
Subject: [maas] Set boot source selections
X-Git-Tag: opnfv-7.0.0~212
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=4b28a7bb0097434381e5a0508ee865a2c2fba9c2;p=fuel.git

[maas] Set boot source selections

Select xenial image explicitly to avoid getting latest bionic one.

Change-Id: Iee872b8dd2ce309231829a0ad8e5a3cf1a75f796
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---

diff --git a/mcp/patches/0016-Set-boot-source-selections.patch b/mcp/patches/0016-Set-boot-source-selections.patch
new file mode 100644
index 000000000..73bdc90e9
--- /dev/null
+++ b/mcp/patches/0016-Set-boot-source-selections.patch
@@ -0,0 +1,31 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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: Michael Polenchuk <mpolenchuk@mirantis.com>
+Date: Thu, 26 Apr 2018 16:29:02 +0400
+Subject: [PATCH] Set boot source selections
+
+Change-Id: I8dc738b3e6e6f1bfcc1348873f162651aff8bbdf
+
+diff --git a/maas/region.sls b/maas/region.sls
+index 39844bd..e231795 100644
+--- a/maas/region.sls
++++ b/maas/region.sls
+@@ -171,6 +171,12 @@ maas_login_admin:
+   cmd.run:
+   - name: "maas-region apikey --username {{ region.admin.username }} > /var/lib/maas/.maas_credentials"
+
++boot_source_selections:
++  cmd.run:
++  - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && maas opnfv boot-source-selections create 1 os='ubuntu' release='{{ region.maas_config.default_distro_series }}' arches='{{ pillar._param.opnfv_maas_node01_architecture.split('/')[0] }}' subarches='*' labels='*'"
++  - require:
++    - cmd: maas_login_admin
++
+ maas_force_artifact_sync:
+   cmd.script:
+   - name: salt://maas/files/maas-artifact-sync.sh
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index dfb0df773..6a6e7a361 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -16,3 +16,4 @@
 /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
 /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
 /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
+/usr/share/salt-formulas/env: 0016-Set-boot-source-selections.patch