diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-26 13:56:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-26 13:56:46 +0000 |
| commit | 39c9a0bee27faf0313c79a58103704e94ac91ede (patch) | |
| tree | caaf742f4d4676cd701ccc1c5c642f3864d4fe34 | |
| parent | 5ccfb79098c726477e9a07dad2a57e0693bf6ba6 (diff) | |
| parent | 6d5d4335af6317e228baa4f9d60c307176c96a18 (diff) | |
Merge "[maas] Set boot source selections" into stable/fraser
| -rw-r--r-- | mcp/patches/0016-Set-boot-source-selections.patch | 31 | ||||
| -rw-r--r-- | mcp/patches/patches.list | 1 |
2 files changed, 32 insertions, 0 deletions
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 |