summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-08 13:21:58 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-08 13:21:58 +0000
commitce2d5fc4b6b4cda93f858adc5ac6ab991495e8a9 (patch)
tree99d2b769343e1c0462f054c983c50f013d3ca464
parent6a3bbf95c70207a146c5b2c82d8518cf02e5c269 (diff)
parent91cbeba3e6fce6a9d292a7af8849db293617038b (diff)
Merge changes from topic 'baremetal-noha'
* changes: [scenarios] noha: Add MaaS VM, state to scenarios [states] baremetal_init: dist_upgrade=True
-rw-r--r--mcp/config/scenario/.gitignore2
-rw-r--r--mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2 (renamed from mcp/config/scenario/os-nosdn-nofeature-noha.yaml)8
-rw-r--r--mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 (renamed from mcp/config/scenario/os-nosdn-ovs-noha.yaml)8
-rw-r--r--mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 (renamed from mcp/config/scenario/os-odl-nofeature-noha.yaml)8
-rw-r--r--mcp/config/scenario/os-odl-ovs-noha.yaml.j2 (renamed from mcp/config/scenario/os-odl-ovs-noha.yaml)8
-rw-r--r--mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 (renamed from mcp/config/scenario/os-ovn-nofeature-noha.yaml)8
-rwxr-xr-xmcp/config/states/baremetal_init2
7 files changed, 42 insertions, 2 deletions
diff --git a/mcp/config/scenario/.gitignore b/mcp/config/scenario/.gitignore
index 46c7f92c8..a2d43db14 100644
--- a/mcp/config/scenario/.gitignore
+++ b/mcp/config/scenario/.gitignore
@@ -1 +1 @@
-*-ha.yaml
+*ha.yaml
diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2
index 8a3a33db0..a0ad96b87 100644
--- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2
@@ -5,10 +5,15 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+{%- import 'net_map.j2' as nm with context %}
---
cluster:
domain: mcp-ovs-noha.local
states:
+{%- if nm.cluster.has_baremetal_nodes %}
+ - maas
+ - baremetal_init
+{%- endif %}
- openstack_noha
- neutron_gateway
- networks
@@ -16,6 +21,9 @@ virtual:
nodes:
infra:
- cfg01
+{%- if nm.cluster.has_baremetal_nodes %}
+ - mas01
+{%- endif %}
control:
- ctl01
- gtw01
diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2
index 795b73064..bee0e926f 100644
--- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2
@@ -5,10 +5,15 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+{%- import 'net_map.j2' as nm with context %}
---
cluster:
domain: mcp-ovs-dpdk-noha.local
states:
+{%- if nm.cluster.has_baremetal_nodes %}
+ - maas
+ - baremetal_init
+{%- endif %}
- dpdk
- openstack_noha
- neutron_gateway
@@ -17,6 +22,9 @@ virtual:
nodes:
infra:
- cfg01
+{%- if nm.cluster.has_baremetal_nodes %}
+ - mas01
+{%- endif %}
control:
- ctl01
- gtw01
diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2
index d0a490ef9..7df28c2b3 100644
--- a/mcp/config/scenario/os-odl-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2
@@ -5,10 +5,15 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+{%- import 'net_map.j2' as nm with context %}
---
cluster:
domain: mcp-odl-noha.local
states:
+{%- if nm.cluster.has_baremetal_nodes %}
+ - maas
+ - baremetal_init
+{%- endif %}
- opendaylight
- openstack_noha
- neutron_gateway
@@ -17,6 +22,9 @@ virtual:
nodes:
infra:
- cfg01
+{%- if nm.cluster.has_baremetal_nodes %}
+ - mas01
+{%- endif %}
control:
- ctl01
- gtw01
diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml.j2
index 29e6842ac..c81d35c51 100644
--- a/mcp/config/scenario/os-odl-ovs-noha.yaml
+++ b/mcp/config/scenario/os-odl-ovs-noha.yaml.j2
@@ -5,10 +5,15 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+{%- import 'net_map.j2' as nm with context %}
---
cluster:
domain: mcp-odl-noha.local
states:
+{%- if nm.cluster.has_baremetal_nodes %}
+ - maas
+ - baremetal_init
+{%- endif %}
- dpdk
- opendaylight
- openstack_noha
@@ -18,6 +23,9 @@ virtual:
nodes:
infra:
- cfg01
+{%- if nm.cluster.has_baremetal_nodes %}
+ - mas01
+{%- endif %}
control:
- ctl01
- gtw01
diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2
index fc4086670..fee47d7eb 100644
--- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2
@@ -5,16 +5,24 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+{%- import 'net_map.j2' as nm with context %}
---
cluster:
domain: mcp-ovn-noha.local
states:
+{%- if nm.cluster.has_baremetal_nodes %}
+ - maas
+ - baremetal_init
+{%- endif %}
- openstack_noha
- networks
virtual:
nodes:
infra:
- cfg01
+{%- if nm.cluster.has_baremetal_nodes %}
+ - mas01
+{%- endif %}
control:
- ctl01
compute:
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
index f363e4a1a..358e1874d 100755
--- a/mcp/config/states/baremetal_init
+++ b/mcp/config/states/baremetal_init
@@ -36,4 +36,4 @@ salt -C "${cluster_nodes_query}" system.reboot
wait_for 90.0 "salt -C '${cluster_nodes_query}' test.ping"
salt -C "${cluster_nodes_query}" state.apply linux,ntp
-salt -C "${cluster_nodes_query}" pkg.upgrade refresh=False
+salt -C "${cluster_nodes_query}" pkg.upgrade refresh=False dist_upgrade=True