summaryrefslogtreecommitdiffstats
path: root/mcp/config/scenario
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-18 03:46:13 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-29 01:27:28 +0200
commitab18375a629010525ac15bc11ce2d4e4cf393fe9 (patch)
tree38dc93fe27b88db9ebe489e4c685b06e4b80561e /mcp/config/scenario
parentcfa1c0d67ee23edcbc25d9620754159645981dd8 (diff)
[docker] Switch to containerized Salt Master
* Refactor OPNFV salt-formulas mechanism to resemble upstream git structure: - git submodules: add new submodule for each formula we patch; - create salt-formula-x directories for OPNFV formulas; - move mcp/metadata/service contents to their each formula subdir; - use `make patches-import` for patches previously handled by patch.sh; - retire patch.sh * states: add virtual_init: - mostly based on old salt.sh, which is now obsolete; - exclude salt-master service restart (it would kill the container); * scenarios: cleanup (rm cfg01 virtual node def), adopt virtual_init; * reclass: align our model with prebuilt container's Salt config: - drop linux:network pillar data (handled by Docker); - stop applying linux.system state on cfg01; - align salt user homedir; - drop salt-formula packages (preprovisioned); * minor plumbing in deploy.sh and lib.sh; JIRA: FUEL-383 Change-Id: I28708a9b399d3f19012212c71966ebda9d6fc0ac Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/config/scenario')
-rw-r--r--mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j25
-rw-r--r--mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j22
-rw-r--r--mcp/config/scenario/os-nosdn-ovs-ha.yaml.j25
-rw-r--r--mcp/config/scenario/os-nosdn-ovs-noha.yaml.j22
-rw-r--r--mcp/config/scenario/os-odl-nofeature-ha.yaml.j25
-rw-r--r--mcp/config/scenario/os-odl-nofeature-noha.yaml.j22
-rw-r--r--mcp/config/scenario/os-odl-ovs-noha.yaml.j22
-rw-r--r--mcp/config/scenario/os-ovn-nofeature-ha.yaml.j25
-rw-r--r--mcp/config/scenario/os-ovn-nofeature-noha.yaml.j22
9 files changed, 9 insertions, 21 deletions
diff --git a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
index 7eb604e65..55da8f74b 100644
--- a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
@@ -10,6 +10,7 @@
cluster:
domain: mcp-ovs-ha.local
states:
+ - virtual_init
{%- if nm.cluster.has_baremetal_nodes %}
- maas
- baremetal_init
@@ -22,7 +23,6 @@ cluster:
virtual:
nodes:
infra:
- - cfg01
{%- if nm.cluster.has_baremetal_nodes %}
- mas01
{%- endif %}
@@ -34,9 +34,6 @@ virtual:
- cmp001
- cmp002
# Below values are only used for each node if said node is virtual
- cfg01:
- vcpus: 4
- ram: 6144
mas01:
vcpus: 4
ram: 6144
diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2
index a0ad96b87..cd214a5cd 100644
--- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2
@@ -10,6 +10,7 @@
cluster:
domain: mcp-ovs-noha.local
states:
+ - virtual_init
{%- if nm.cluster.has_baremetal_nodes %}
- maas
- baremetal_init
@@ -20,7 +21,6 @@ cluster:
virtual:
nodes:
infra:
- - cfg01
{%- if nm.cluster.has_baremetal_nodes %}
- mas01
{%- endif %}
diff --git a/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2
index da9938ce0..0f7a7bc34 100644
--- a/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2
@@ -10,6 +10,7 @@
cluster:
domain: mcp-ovs-dpdk-ha.local
states:
+ - virtual_init
{%- if nm.cluster.has_baremetal_nodes %}
- maas
- baremetal_init
@@ -23,7 +24,6 @@ cluster:
virtual:
nodes:
infra:
- - cfg01
{%- if nm.cluster.has_baremetal_nodes %}
- mas01
{%- endif %}
@@ -35,9 +35,6 @@ virtual:
- cmp001
- cmp002
# Below values are only used for each node if said node is virtual
- cfg01:
- vcpus: 4
- ram: 6144
mas01:
vcpus: 4
ram: 6144
diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 b/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2
index bee0e926f..bf37f93ea 100644
--- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2
@@ -10,6 +10,7 @@
cluster:
domain: mcp-ovs-dpdk-noha.local
states:
+ - virtual_init
{%- if nm.cluster.has_baremetal_nodes %}
- maas
- baremetal_init
@@ -21,7 +22,6 @@ cluster:
virtual:
nodes:
infra:
- - cfg01
{%- if nm.cluster.has_baremetal_nodes %}
- mas01
{%- endif %}
diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2
index fbedbc6b9..b31dc136e 100644
--- a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2
+++ b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2
@@ -10,6 +10,7 @@
cluster:
domain: mcp-odl-ha.local
states:
+ - virtual_init
{%- if nm.cluster.has_baremetal_nodes %}
- maas
- baremetal_init
@@ -23,7 +24,6 @@ cluster:
virtual:
nodes:
infra:
- - cfg01
{%- if nm.cluster.has_baremetal_nodes %}
- mas01
{%- endif %}
@@ -35,9 +35,6 @@ virtual:
- cmp001
- cmp002
# Below values are only used for each node if said node is virtual
- cfg01:
- vcpus: 4
- ram: 6144
mas01:
vcpus: 4
ram: 6144
diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2
index 7df28c2b3..2a10a3163 100644
--- a/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2
+++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2
@@ -10,6 +10,7 @@
cluster:
domain: mcp-odl-noha.local
states:
+ - virtual_init
{%- if nm.cluster.has_baremetal_nodes %}
- maas
- baremetal_init
@@ -21,7 +22,6 @@ cluster:
virtual:
nodes:
infra:
- - cfg01
{%- if nm.cluster.has_baremetal_nodes %}
- mas01
{%- endif %}
diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml.j2 b/mcp/config/scenario/os-odl-ovs-noha.yaml.j2
index c81d35c51..62c120b26 100644
--- a/mcp/config/scenario/os-odl-ovs-noha.yaml.j2
+++ b/mcp/config/scenario/os-odl-ovs-noha.yaml.j2
@@ -10,6 +10,7 @@
cluster:
domain: mcp-odl-noha.local
states:
+ - virtual_init
{%- if nm.cluster.has_baremetal_nodes %}
- maas
- baremetal_init
@@ -22,7 +23,6 @@ cluster:
virtual:
nodes:
infra:
- - cfg01
{%- if nm.cluster.has_baremetal_nodes %}
- mas01
{%- endif %}
diff --git a/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2
index f81779b8a..021548f63 100644
--- a/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2
+++ b/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2
@@ -10,6 +10,7 @@
cluster:
domain: mcp-ovn-ha.local
states:
+ - virtual_init
{%- if nm.cluster.has_baremetal_nodes %}
- maas
- baremetal_init
@@ -22,7 +23,6 @@ cluster:
virtual:
nodes:
infra:
- - cfg01
{%- if nm.cluster.has_baremetal_nodes %}
- mas01
{%- endif %}
@@ -34,9 +34,6 @@ virtual:
- cmp001
- cmp002
# Below values are only used for each node if said node is virtual
- cfg01:
- vcpus: 4
- ram: 6144
mas01:
vcpus: 4
ram: 6144
diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 b/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2
index fee47d7eb..635106355 100644
--- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2
+++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2
@@ -10,6 +10,7 @@
cluster:
domain: mcp-ovn-noha.local
states:
+ - virtual_init
{%- if nm.cluster.has_baremetal_nodes %}
- maas
- baremetal_init
@@ -19,7 +20,6 @@ cluster:
virtual:
nodes:
infra:
- - cfg01
{%- if nm.cluster.has_baremetal_nodes %}
- mas01
{%- endif %}