Fix new contexts for cookiecutter generator
Change-Id: I4cf7c9a1725d7bdf7acd624f31a3f149ae1baa07
diff --git a/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-ocata-dvr.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-ocata-dvr.yaml
index b023653..373a53a 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-ocata-dvr.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-ocata-dvr.yaml
@@ -1,13 +1,12 @@
{% from 'cookied-model-generator/underlay.yaml' import HOSTNAME_CFG01 with context %}
{% from 'cookied-model-generator/underlay.yaml' import DOMAIN_NAME with context %}
-{% from 'cookied-model-generator/underlay.yaml' import CLUSTER_NAME with context %}
{% set SALT_MODELS_REPOSITORY = os_env('SALT_MODELS_REPOSITORY','https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab') %}
# Other salt model repository parameters see in shared-salt.yaml
{% set LAB_CONFIG_NAME = 'virtual-mcp-ocata-dvr' %}
# Name of the context file (without extension, that is fixed .yaml) used to render the Environment model
-{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME', CLUSTER_NAME) %}
+{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME', LAB_CONFIG_NAME) %}
# Path to the context files used to render Cluster and Environment models
{%- set CLUSTER_CONTEXT_NAME = '_context-cookiecutter-mcp-ocata-dvr.yaml' %}
{%- set ENVIRONMENT_CONTEXT_NAMES = ['_context-environment.yaml'] %}
@@ -21,19 +20,23 @@
- description: "Workaround for combined roles: remove unnecessary classes"
cmd: |
set -e;
- sed -i '/system.reclass.storage.system.openstack_database_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- sed -i '/system.reclass.storage.system.openstack_message_queue_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- sed -i '/system.reclass.storage.system.stacklight_telemetry_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- sed -i '/system.reclass.storage.system.stacklight_log_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.physical_control_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.openstack_database_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.openstack_message_queue_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.stacklight_telemetry_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.stacklight_log_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
. /root/venv-reclass-tools/bin/activate;
- reclass-tools del-key parameters.reclass.storage.node.openstack_database_node01 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_database_node02 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_database_node03 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node01 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node02 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node03 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.stacklight_log_node01 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_database_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_database_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_database_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.stacklight_log_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
diff --git a/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-ocata-ovs.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-ocata-ovs.yaml
index ffb84b7..b711673 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-ocata-ovs.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-ocata-ovs.yaml
@@ -1,13 +1,12 @@
{% from 'cookied-model-generator/underlay.yaml' import HOSTNAME_CFG01 with context %}
{% from 'cookied-model-generator/underlay.yaml' import DOMAIN_NAME with context %}
-{% from 'cookied-model-generator/underlay.yaml' import CLUSTER_NAME with context %}
{% set SALT_MODELS_REPOSITORY = os_env('SALT_MODELS_REPOSITORY','https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab') %}
# Other salt model repository parameters see in shared-salt.yaml
{% set LAB_CONFIG_NAME = 'virtual-mcp-ocata-ovs' %}
# Name of the context file (without extension, that is fixed .yaml) used to render the Environment model
-{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME', CLUSTER_NAME) %}
+{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME', LAB_CONFIG_NAME) %}
# Path to the context files used to render Cluster and Environment models
{%- set CLUSTER_CONTEXT_NAME = '_context-cookiecutter-mcp-ocata-ovs.yaml' %}
{%- set ENVIRONMENT_CONTEXT_NAMES = ['_context-environment.yaml'] %}
@@ -21,19 +20,23 @@
- description: "Workaround for combined roles: remove unnecessary classes"
cmd: |
set -e;
- sed -i '/system.reclass.storage.system.openstack_database_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- sed -i '/system.reclass.storage.system.openstack_message_queue_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- sed -i '/system.reclass.storage.system.stacklight_telemetry_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- sed -i '/system.reclass.storage.system.stacklight_log_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.physical_control_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.openstack_database_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.openstack_message_queue_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.stacklight_telemetry_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.stacklight_log_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
. /root/venv-reclass-tools/bin/activate;
- reclass-tools del-key parameters.reclass.storage.node.openstack_database_node01 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_database_node02 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_database_node03 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node01 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node02 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node03 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.stacklight_log_node01 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_database_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_database_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_database_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.stacklight_log_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
diff --git a/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-pike-dvr.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-pike-dvr.yaml
index 9cb3ac0..4fb43bf 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-pike-dvr.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-pike-dvr.yaml
@@ -1,13 +1,12 @@
{% from 'cookied-model-generator/underlay.yaml' import HOSTNAME_CFG01 with context %}
{% from 'cookied-model-generator/underlay.yaml' import DOMAIN_NAME with context %}
-{% from 'cookied-model-generator/underlay.yaml' import CLUSTER_NAME with context %}
{% set SALT_MODELS_REPOSITORY = os_env('SALT_MODELS_REPOSITORY','https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab') %}
# Other salt model repository parameters see in shared-salt.yaml
{% set LAB_CONFIG_NAME = 'virtual-mcp-pike-dvr' %}
# Name of the context file (without extension, that is fixed .yaml) used to render the Environment model
-{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME', CLUSTER_NAME) %}
+{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME', LAB_CONFIG_NAME) %}
# Path to the context files used to render Cluster and Environment models
{%- set CLUSTER_CONTEXT_NAME = '_context-cookiecutter-mcp-pike-dvr.yaml' %}
{%- set ENVIRONMENT_CONTEXT_NAMES = ['_context-environment.yaml'] %}
@@ -21,19 +20,23 @@
- description: "Workaround for combined roles: remove unnecessary classes"
cmd: |
set -e;
- sed -i '/system.reclass.storage.system.openstack_database_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- sed -i '/system.reclass.storage.system.openstack_message_queue_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- sed -i '/system.reclass.storage.system.stacklight_telemetry_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- sed -i '/system.reclass.storage.system.stacklight_log_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.physical_control_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.openstack_database_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.openstack_message_queue_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.stacklight_telemetry_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.stacklight_log_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
. /root/venv-reclass-tools/bin/activate;
- reclass-tools del-key parameters.reclass.storage.node.openstack_database_node01 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_database_node02 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_database_node03 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node01 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node02 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node03 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.stacklight_log_node01 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_database_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_database_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_database_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.stacklight_log_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
diff --git a/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-pike-ovs.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-pike-ovs.yaml
index 452657c..47427e3 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-pike-ovs.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-pike-ovs.yaml
@@ -1,13 +1,12 @@
{% from 'cookied-model-generator/underlay.yaml' import HOSTNAME_CFG01 with context %}
{% from 'cookied-model-generator/underlay.yaml' import DOMAIN_NAME with context %}
-{% from 'cookied-model-generator/underlay.yaml' import CLUSTER_NAME with context %}
{% set SALT_MODELS_REPOSITORY = os_env('SALT_MODELS_REPOSITORY','https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab') %}
# Other salt model repository parameters see in shared-salt.yaml
{% set LAB_CONFIG_NAME = 'virtual-mcp-pike-ovs' %}
# Name of the context file (without extension, that is fixed .yaml) used to render the Environment model
-{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME', CLUSTER_NAME) %}
+{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME', LAB_CONFIG_NAME) %}
# Path to the context files used to render Cluster and Environment models
{%- set CLUSTER_CONTEXT_NAME = '_context-cookiecutter-mcp-pike-ovs.yaml' %}
{%- set ENVIRONMENT_CONTEXT_NAMES = ['_context-environment.yaml'] %}
@@ -21,19 +20,23 @@
- description: "Workaround for combined roles: remove unnecessary classes"
cmd: |
set -e;
- sed -i '/system.reclass.storage.system.openstack_database_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- sed -i '/system.reclass.storage.system.openstack_message_queue_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- sed -i '/system.reclass.storage.system.stacklight_telemetry_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- sed -i '/system.reclass.storage.system.stacklight_log_cluster/d' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.physical_control_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.openstack_database_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.openstack_message_queue_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.stacklight_telemetry_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ sed -i '/system.reclass.storage.system.stacklight_log_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
. /root/venv-reclass-tools/bin/activate;
- reclass-tools del-key parameters.reclass.storage.node.openstack_database_node01 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_database_node02 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_database_node03 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node01 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node02 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node03 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
- reclass-tools del-key parameters.reclass.storage.node.stacklight_log_node01 /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_database_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_database_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_database_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.openstack_message_queue_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
+ reclass-tools del-key parameters.reclass.storage.node.stacklight_log_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
diff --git a/tcp_tests/templates/virtual-mcp-ocata-dvr/_context-cookiecutter-mcp-ocata-dvr.yaml b/tcp_tests/templates/virtual-mcp-ocata-dvr/_context-cookiecutter-mcp-ocata-dvr.yaml
index b4e8a77..e5790f4 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-dvr/_context-cookiecutter-mcp-ocata-dvr.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-dvr/_context-cookiecutter-mcp-ocata-dvr.yaml
@@ -2,8 +2,9 @@
bmk_enabled: 'False'
ceph_enabled: 'False'
cicd_enabled: 'False'
- cluster_domain: cookied-mcp-ocata-ovs.local
- cluster_name: cookied-mcp-ocata-ovs
+ cluster_domain: cookied-mcp-ocata-dvr.local
+ cluster_name: cookied-mcp-ocata-dvr
+ compute_bond_mode: active-backup
compute_primary_first_nic: eth1
compute_primary_second_nic: eth2
context_seed: wUqrwKeBTCpRpVrhK1KwZQv4cjM9VhG7L2vQ0iQsTuMrXASklEBDmJEf6bnPEqcK
@@ -16,14 +17,30 @@
deploy_network_gateway: 192.168.10.1
deploy_network_netmask: 255.255.255.0
deploy_network_subnet: 192.168.10.0/24
- deployment_type: heat
+ deployment_type: physical
dns_server01: 8.8.8.8
dns_server02: 8.8.4.4
email_address: ddmitriev@mirantis.com
gateway_primary_first_nic: eth1
gateway_primary_second_nic: eth2
+ infra_bond_mode: active-backup
+ infra_deploy_nic: eth0
+ infra_kvm01_control_address: 172.16.10.101
+ infra_kvm01_deploy_address: 192.168.10.101
+ infra_kvm01_hostname: kvm01
+ infra_kvm02_control_address: 172.16.10.102
+ infra_kvm02_deploy_address: 192.168.10.102
+ infra_kvm02_hostname: kvm02
+ infra_kvm03_control_address: 172.16.10.103
+ infra_kvm03_deploy_address: 192.168.10.103
+ infra_kvm03_hostname: kvm03
+ infra_kvm_vip_address: 172.16.10.100
+ infra_primary_first_nic: eth1
+ infra_primary_second_nic: eth2
kubernetes_enabled: 'False'
local_repositories: 'False'
+ maas_deploy_address: 192.168.10.90
+ maas_hostname: cfg01
mcp_version: stable
offline_deployment: 'False'
opencontrail_enabled: 'False'
@@ -42,13 +59,13 @@
openstack_control_node02_hostname: ctl02
openstack_control_node03_address: 172.16.10.103
openstack_control_node03_hostname: ctl03
- openstack_database_address: 172.16.10.50
+ openstack_database_address: 172.16.10.100
openstack_database_hostname: dbs
- openstack_database_node01_address: 172.16.10.51
+ openstack_database_node01_address: 172.16.10.101
openstack_database_node01_hostname: dbs01
- openstack_database_node02_address: 172.16.10.52
+ openstack_database_node02_address: 172.16.10.102
openstack_database_node02_hostname: dbs02
- openstack_database_node03_address: 172.16.10.53
+ openstack_database_node03_address: 172.16.10.103
openstack_database_node03_hostname: dbs03
openstack_enabled: 'True'
openstack_gateway_node01_address: 172.16.10.110
@@ -60,13 +77,13 @@
openstack_gateway_node03_address: 172.16.10.112
openstack_gateway_node03_hostname: gtw03
openstack_gateway_node03_tenant_address: 10.1.0.8
- openstack_message_queue_address: 172.16.10.40
+ openstack_message_queue_address: 172.16.10.100
openstack_message_queue_hostname: msg
- openstack_message_queue_node01_address: 172.16.10.41
+ openstack_message_queue_node01_address: 172.16.10.101
openstack_message_queue_node01_hostname: msg01
- openstack_message_queue_node02_address: 172.16.10.42
+ openstack_message_queue_node02_address: 172.16.10.102
openstack_message_queue_node02_hostname: msg02
- openstack_message_queue_node03_address: 172.16.10.43
+ openstack_message_queue_node03_address: 172.16.10.103
openstack_message_queue_node03_hostname: msg03
openstack_network_engine: ovs
openstack_neutron_qos: 'False'
@@ -101,13 +118,13 @@
salt_master_management_address: 192.168.10.90
shared_reclass_url: ssh://mcp-jenkins@gerrit.mcp.mirantis.net:29418/salt-models/reclass-system.git
stacklight_enabled: 'True'
- stacklight_log_address: 172.16.10.60
+ stacklight_log_address: 172.16.10.70
stacklight_log_hostname: log
- stacklight_log_node01_address: 172.16.10.61
+ stacklight_log_node01_address: 172.16.10.107
stacklight_log_node01_hostname: log01
- stacklight_log_node02_address: 172.16.10.62
+ stacklight_log_node02_address: 172.16.10.108
stacklight_log_node02_hostname: log02
- stacklight_log_node03_address: 172.16.10.63
+ stacklight_log_node03_address: 172.16.10.109
stacklight_log_node03_hostname: log03
stacklight_monitor_address: 172.16.10.70
stacklight_monitor_hostname: mon
@@ -119,13 +136,13 @@
stacklight_monitor_node03_hostname: mon03
stacklight_notification_address: alerts@localhost
stacklight_notification_smtp_host: 127.0.0.1
- stacklight_telemetry_address: 172.16.10.85
+ stacklight_telemetry_address: 172.16.10.70
stacklight_telemetry_hostname: mtr
- stacklight_telemetry_node01_address: 172.16.10.86
+ stacklight_telemetry_node01_address: 172.16.10.107
stacklight_telemetry_node01_hostname: mtr01
- stacklight_telemetry_node02_address: 172.16.10.87
+ stacklight_telemetry_node02_address: 172.16.10.108
stacklight_telemetry_node02_hostname: mtr02
- stacklight_telemetry_node03_address: 172.16.10.88
+ stacklight_telemetry_node03_address: 172.16.10.109
stacklight_telemetry_node03_hostname: mtr03
stacklight_version: '2'
static_ips_on_deploy_network_enabled: 'False'
@@ -134,4 +151,4 @@
tenant_network_subnet: 10.1.0.0/24
tenant_vlan: '20'
upstream_proxy_enabled: 'False'
- use_default_network_scheme: 'True'
+ use_default_network_scheme: 'False'
diff --git a/tcp_tests/templates/virtual-mcp-ocata-ovs/_context-cookiecutter-mcp-ocata-ovs.yaml b/tcp_tests/templates/virtual-mcp-ocata-ovs/_context-cookiecutter-mcp-ocata-ovs.yaml
index 4394f23..c221b7f 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ovs/_context-cookiecutter-mcp-ocata-ovs.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ovs/_context-cookiecutter-mcp-ocata-ovs.yaml
@@ -4,9 +4,10 @@
cicd_enabled: 'False'
cluster_domain: cookied-mcp-ocata-ovs.local
cluster_name: cookied-mcp-ocata-ovs
+ compute_bond_mode: active-backup
compute_primary_first_nic: eth1
compute_primary_second_nic: eth2
- context_seed: wUqrwKeBTCpRpVrhK1KwZQv4cjM9VhG7L2vQ0iQsTuMrXASklEBDmJEf6bnPEqcK
+ context_seed: U1hx5V31VJfFFBu8fCsk9ebDN2TwuBABTIcptYQ8tmFSlhSxHIkKnJnDsnckgKnH
control_network_netmask: 255.255.255.0
control_network_subnet: 172.16.10.0/24
control_vlan: '10'
@@ -16,14 +17,30 @@
deploy_network_gateway: 192.168.10.1
deploy_network_netmask: 255.255.255.0
deploy_network_subnet: 192.168.10.0/24
- deployment_type: heat
+ deployment_type: physical
dns_server01: 8.8.8.8
dns_server02: 8.8.4.4
email_address: ddmitriev@mirantis.com
gateway_primary_first_nic: eth1
gateway_primary_second_nic: eth2
+ infra_bond_mode: active-backup
+ infra_deploy_nic: eth0
+ infra_kvm01_control_address: 172.16.10.101
+ infra_kvm01_deploy_address: 192.168.10.101
+ infra_kvm01_hostname: kvm01
+ infra_kvm02_control_address: 172.16.10.102
+ infra_kvm02_deploy_address: 192.168.10.102
+ infra_kvm02_hostname: kvm02
+ infra_kvm03_control_address: 172.16.10.103
+ infra_kvm03_deploy_address: 192.168.10.103
+ infra_kvm03_hostname: kvm03
+ infra_kvm_vip_address: 172.16.10.100
+ infra_primary_first_nic: eth1
+ infra_primary_second_nic: eth2
kubernetes_enabled: 'False'
local_repositories: 'False'
+ maas_deploy_address: 192.168.10.90
+ maas_hostname: cfg01
mcp_version: stable
offline_deployment: 'False'
opencontrail_enabled: 'False'
@@ -42,13 +59,13 @@
openstack_control_node02_hostname: ctl02
openstack_control_node03_address: 172.16.10.103
openstack_control_node03_hostname: ctl03
- openstack_database_address: 172.16.10.50
+ openstack_database_address: 172.16.10.100
openstack_database_hostname: dbs
- openstack_database_node01_address: 172.16.10.51
+ openstack_database_node01_address: 172.16.10.101
openstack_database_node01_hostname: dbs01
- openstack_database_node02_address: 172.16.10.52
+ openstack_database_node02_address: 172.16.10.102
openstack_database_node02_hostname: dbs02
- openstack_database_node03_address: 172.16.10.53
+ openstack_database_node03_address: 172.16.10.103
openstack_database_node03_hostname: dbs03
openstack_enabled: 'True'
openstack_gateway_node01_address: 172.16.10.110
@@ -60,13 +77,13 @@
openstack_gateway_node03_address: 172.16.10.112
openstack_gateway_node03_hostname: gtw03
openstack_gateway_node03_tenant_address: 10.1.0.8
- openstack_message_queue_address: 172.16.10.40
+ openstack_message_queue_address: 172.16.10.100
openstack_message_queue_hostname: msg
- openstack_message_queue_node01_address: 172.16.10.41
+ openstack_message_queue_node01_address: 172.16.10.101
openstack_message_queue_node01_hostname: msg01
- openstack_message_queue_node02_address: 172.16.10.42
+ openstack_message_queue_node02_address: 172.16.10.102
openstack_message_queue_node02_hostname: msg02
- openstack_message_queue_node03_address: 172.16.10.43
+ openstack_message_queue_node03_address: 172.16.10.103
openstack_message_queue_node03_hostname: msg03
openstack_network_engine: ovs
openstack_neutron_qos: 'False'
@@ -94,20 +111,20 @@
public_host: ${_param:openstack_proxy_address}
publication_method: email
reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
- salt_api_password: H0rTPdmktZ8RI7T7y6fjqY0uEbbs7Kwi
- salt_api_password_hash: $6$lfbIFtMZ$.nTbTDMzs1iYv0WqkZHia8H8Fma963Nv3qyyz1x68jQh0YXK9i907B/hvoG4QHMvfolE7V7vQnFClJ1mVA3Yb.
+ salt_api_password: PGah7Ph3IdWuMdAX3ZBLSf5BtlBG1Qhl
+ salt_api_password_hash: $6$kgvztcjH$9B2950AyxRjE2Tj5QNVCnvdrgaFo/u6c59pMoQPqfxs2MTLLU7ywxPTQnDH3cNV.BBEK6FilF9SulWfIfENou0
salt_master_address: 172.16.10.90
salt_master_hostname: cfg01
salt_master_management_address: 192.168.10.90
shared_reclass_url: ssh://mcp-jenkins@gerrit.mcp.mirantis.net:29418/salt-models/reclass-system.git
stacklight_enabled: 'True'
- stacklight_log_address: 172.16.10.60
+ stacklight_log_address: 172.16.10.70
stacklight_log_hostname: log
- stacklight_log_node01_address: 172.16.10.61
+ stacklight_log_node01_address: 172.16.10.107
stacklight_log_node01_hostname: log01
- stacklight_log_node02_address: 172.16.10.62
+ stacklight_log_node02_address: 172.16.10.108
stacklight_log_node02_hostname: log02
- stacklight_log_node03_address: 172.16.10.63
+ stacklight_log_node03_address: 172.16.10.109
stacklight_log_node03_hostname: log03
stacklight_monitor_address: 172.16.10.70
stacklight_monitor_hostname: mon
@@ -119,13 +136,13 @@
stacklight_monitor_node03_hostname: mon03
stacklight_notification_address: alerts@localhost
stacklight_notification_smtp_host: 127.0.0.1
- stacklight_telemetry_address: 172.16.10.85
+ stacklight_telemetry_address: 172.16.10.70
stacklight_telemetry_hostname: mtr
- stacklight_telemetry_node01_address: 172.16.10.86
+ stacklight_telemetry_node01_address: 172.16.10.107
stacklight_telemetry_node01_hostname: mtr01
- stacklight_telemetry_node02_address: 172.16.10.87
+ stacklight_telemetry_node02_address: 172.16.10.108
stacklight_telemetry_node02_hostname: mtr02
- stacklight_telemetry_node03_address: 172.16.10.88
+ stacklight_telemetry_node03_address: 172.16.10.109
stacklight_telemetry_node03_hostname: mtr03
stacklight_version: '2'
static_ips_on_deploy_network_enabled: 'False'
@@ -134,4 +151,4 @@
tenant_network_subnet: 10.1.0.0/24
tenant_vlan: '20'
upstream_proxy_enabled: 'False'
- use_default_network_scheme: 'True'
+ use_default_network_scheme: 'False'
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml
index c09d611..6f39ce6 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml
@@ -2,8 +2,9 @@
bmk_enabled: 'False'
ceph_enabled: 'False'
cicd_enabled: 'False'
- cluster_domain: cookied-mcp-pike-ovs.local
- cluster_name: cookied-mcp-pike-ovs
+ cluster_domain: cookied-mcp-pike-dvr.local
+ cluster_name: cookied-mcp-pike-dvr
+ compute_bond_mode: active-backup
compute_primary_first_nic: eth1
compute_primary_second_nic: eth2
context_seed: wUqrwKeBTCpRpVrhK1KwZQv4cjM9VhG7L2vQ0iQsTuMrXASklEBDmJEf6bnPEqcK
@@ -16,14 +17,30 @@
deploy_network_gateway: 192.168.10.1
deploy_network_netmask: 255.255.255.0
deploy_network_subnet: 192.168.10.0/24
- deployment_type: heat
+ deployment_type: physical
dns_server01: 8.8.8.8
dns_server02: 8.8.4.4
email_address: ddmitriev@mirantis.com
gateway_primary_first_nic: eth1
gateway_primary_second_nic: eth2
+ infra_bond_mode: active-backup
+ infra_deploy_nic: eth0
+ infra_kvm01_control_address: 172.16.10.101
+ infra_kvm01_deploy_address: 192.168.10.101
+ infra_kvm01_hostname: kvm01
+ infra_kvm02_control_address: 172.16.10.102
+ infra_kvm02_deploy_address: 192.168.10.102
+ infra_kvm02_hostname: kvm02
+ infra_kvm03_control_address: 172.16.10.103
+ infra_kvm03_deploy_address: 192.168.10.103
+ infra_kvm03_hostname: kvm03
+ infra_kvm_vip_address: 172.16.10.100
+ infra_primary_first_nic: eth1
+ infra_primary_second_nic: eth2
kubernetes_enabled: 'False'
local_repositories: 'False'
+ maas_deploy_address: 192.168.10.90
+ maas_hostname: cfg01
mcp_version: stable
offline_deployment: 'False'
opencontrail_enabled: 'False'
@@ -42,13 +59,13 @@
openstack_control_node02_hostname: ctl02
openstack_control_node03_address: 172.16.10.103
openstack_control_node03_hostname: ctl03
- openstack_database_address: 172.16.10.50
+ openstack_database_address: 172.16.10.100
openstack_database_hostname: dbs
- openstack_database_node01_address: 172.16.10.51
+ openstack_database_node01_address: 172.16.10.101
openstack_database_node01_hostname: dbs01
- openstack_database_node02_address: 172.16.10.52
+ openstack_database_node02_address: 172.16.10.102
openstack_database_node02_hostname: dbs02
- openstack_database_node03_address: 172.16.10.53
+ openstack_database_node03_address: 172.16.10.103
openstack_database_node03_hostname: dbs03
openstack_enabled: 'True'
openstack_gateway_node01_address: 172.16.10.110
@@ -60,13 +77,13 @@
openstack_gateway_node03_address: 172.16.10.112
openstack_gateway_node03_hostname: gtw03
openstack_gateway_node03_tenant_address: 10.1.0.8
- openstack_message_queue_address: 172.16.10.40
+ openstack_message_queue_address: 172.16.10.100
openstack_message_queue_hostname: msg
- openstack_message_queue_node01_address: 172.16.10.41
+ openstack_message_queue_node01_address: 172.16.10.101
openstack_message_queue_node01_hostname: msg01
- openstack_message_queue_node02_address: 172.16.10.42
+ openstack_message_queue_node02_address: 172.16.10.102
openstack_message_queue_node02_hostname: msg02
- openstack_message_queue_node03_address: 172.16.10.43
+ openstack_message_queue_node03_address: 172.16.10.103
openstack_message_queue_node03_hostname: msg03
openstack_network_engine: ovs
openstack_neutron_qos: 'False'
@@ -101,13 +118,13 @@
salt_master_management_address: 192.168.10.90
shared_reclass_url: ssh://mcp-jenkins@gerrit.mcp.mirantis.net:29418/salt-models/reclass-system.git
stacklight_enabled: 'True'
- stacklight_log_address: 172.16.10.60
+ stacklight_log_address: 172.16.10.70
stacklight_log_hostname: log
- stacklight_log_node01_address: 172.16.10.61
+ stacklight_log_node01_address: 172.16.10.107
stacklight_log_node01_hostname: log01
- stacklight_log_node02_address: 172.16.10.62
+ stacklight_log_node02_address: 172.16.10.108
stacklight_log_node02_hostname: log02
- stacklight_log_node03_address: 172.16.10.63
+ stacklight_log_node03_address: 172.16.10.109
stacklight_log_node03_hostname: log03
stacklight_monitor_address: 172.16.10.70
stacklight_monitor_hostname: mon
@@ -119,13 +136,13 @@
stacklight_monitor_node03_hostname: mon03
stacklight_notification_address: alerts@localhost
stacklight_notification_smtp_host: 127.0.0.1
- stacklight_telemetry_address: 172.16.10.85
+ stacklight_telemetry_address: 172.16.10.70
stacklight_telemetry_hostname: mtr
- stacklight_telemetry_node01_address: 172.16.10.86
+ stacklight_telemetry_node01_address: 172.16.10.107
stacklight_telemetry_node01_hostname: mtr01
- stacklight_telemetry_node02_address: 172.16.10.87
+ stacklight_telemetry_node02_address: 172.16.10.108
stacklight_telemetry_node02_hostname: mtr02
- stacklight_telemetry_node03_address: 172.16.10.88
+ stacklight_telemetry_node03_address: 172.16.10.109
stacklight_telemetry_node03_hostname: mtr03
stacklight_version: '2'
static_ips_on_deploy_network_enabled: 'False'
@@ -134,4 +151,4 @@
tenant_network_subnet: 10.1.0.0/24
tenant_vlan: '20'
upstream_proxy_enabled: 'False'
- use_default_network_scheme: 'True'
+ use_default_network_scheme: 'False'
diff --git a/tcp_tests/templates/virtual-mcp-pike-ovs/_context-cookiecutter-mcp-pike-ovs.yaml b/tcp_tests/templates/virtual-mcp-pike-ovs/_context-cookiecutter-mcp-pike-ovs.yaml
index ced5a69..a3d0f49 100644
--- a/tcp_tests/templates/virtual-mcp-pike-ovs/_context-cookiecutter-mcp-pike-ovs.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-ovs/_context-cookiecutter-mcp-pike-ovs.yaml
@@ -4,6 +4,7 @@
cicd_enabled: 'False'
cluster_domain: cookied-mcp-pike-ovs.local
cluster_name: cookied-mcp-pike-ovs
+ compute_bond_mode: active-backup
compute_primary_first_nic: eth1
compute_primary_second_nic: eth2
context_seed: wUqrwKeBTCpRpVrhK1KwZQv4cjM9VhG7L2vQ0iQsTuMrXASklEBDmJEf6bnPEqcK
@@ -16,14 +17,30 @@
deploy_network_gateway: 192.168.10.1
deploy_network_netmask: 255.255.255.0
deploy_network_subnet: 192.168.10.0/24
- deployment_type: heat
+ deployment_type: physical
dns_server01: 8.8.8.8
dns_server02: 8.8.4.4
email_address: ddmitriev@mirantis.com
gateway_primary_first_nic: eth1
gateway_primary_second_nic: eth2
+ infra_bond_mode: active-backup
+ infra_deploy_nic: eth0
+ infra_kvm01_control_address: 172.16.10.101
+ infra_kvm01_deploy_address: 192.168.10.101
+ infra_kvm01_hostname: kvm01
+ infra_kvm02_control_address: 172.16.10.102
+ infra_kvm02_deploy_address: 192.168.10.102
+ infra_kvm02_hostname: kvm02
+ infra_kvm03_control_address: 172.16.10.103
+ infra_kvm03_deploy_address: 192.168.10.103
+ infra_kvm03_hostname: kvm03
+ infra_kvm_vip_address: 172.16.10.100
+ infra_primary_first_nic: eth1
+ infra_primary_second_nic: eth2
kubernetes_enabled: 'False'
local_repositories: 'False'
+ maas_deploy_address: 192.168.10.90
+ maas_hostname: cfg01
mcp_version: stable
offline_deployment: 'False'
opencontrail_enabled: 'False'
@@ -42,13 +59,13 @@
openstack_control_node02_hostname: ctl02
openstack_control_node03_address: 172.16.10.103
openstack_control_node03_hostname: ctl03
- openstack_database_address: 172.16.10.50
+ openstack_database_address: 172.16.10.100
openstack_database_hostname: dbs
- openstack_database_node01_address: 172.16.10.51
+ openstack_database_node01_address: 172.16.10.101
openstack_database_node01_hostname: dbs01
- openstack_database_node02_address: 172.16.10.52
+ openstack_database_node02_address: 172.16.10.102
openstack_database_node02_hostname: dbs02
- openstack_database_node03_address: 172.16.10.53
+ openstack_database_node03_address: 172.16.10.103
openstack_database_node03_hostname: dbs03
openstack_enabled: 'True'
openstack_gateway_node01_address: 172.16.10.110
@@ -60,13 +77,13 @@
openstack_gateway_node03_address: 172.16.10.112
openstack_gateway_node03_hostname: gtw03
openstack_gateway_node03_tenant_address: 10.1.0.8
- openstack_message_queue_address: 172.16.10.40
+ openstack_message_queue_address: 172.16.10.100
openstack_message_queue_hostname: msg
- openstack_message_queue_node01_address: 172.16.10.41
+ openstack_message_queue_node01_address: 172.16.10.101
openstack_message_queue_node01_hostname: msg01
- openstack_message_queue_node02_address: 172.16.10.42
+ openstack_message_queue_node02_address: 172.16.10.102
openstack_message_queue_node02_hostname: msg02
- openstack_message_queue_node03_address: 172.16.10.43
+ openstack_message_queue_node03_address: 172.16.10.103
openstack_message_queue_node03_hostname: msg03
openstack_network_engine: ovs
openstack_neutron_qos: 'False'
@@ -101,13 +118,13 @@
salt_master_management_address: 192.168.10.90
shared_reclass_url: ssh://mcp-jenkins@gerrit.mcp.mirantis.net:29418/salt-models/reclass-system.git
stacklight_enabled: 'True'
- stacklight_log_address: 172.16.10.60
+ stacklight_log_address: 172.16.10.70
stacklight_log_hostname: log
- stacklight_log_node01_address: 172.16.10.61
+ stacklight_log_node01_address: 172.16.10.107
stacklight_log_node01_hostname: log01
- stacklight_log_node02_address: 172.16.10.62
+ stacklight_log_node02_address: 172.16.10.108
stacklight_log_node02_hostname: log02
- stacklight_log_node03_address: 172.16.10.63
+ stacklight_log_node03_address: 172.16.10.109
stacklight_log_node03_hostname: log03
stacklight_monitor_address: 172.16.10.70
stacklight_monitor_hostname: mon
@@ -119,13 +136,13 @@
stacklight_monitor_node03_hostname: mon03
stacklight_notification_address: alerts@localhost
stacklight_notification_smtp_host: 127.0.0.1
- stacklight_telemetry_address: 172.16.10.85
+ stacklight_telemetry_address: 172.16.10.70
stacklight_telemetry_hostname: mtr
- stacklight_telemetry_node01_address: 172.16.10.86
+ stacklight_telemetry_node01_address: 172.16.10.107
stacklight_telemetry_node01_hostname: mtr01
- stacklight_telemetry_node02_address: 172.16.10.87
+ stacklight_telemetry_node02_address: 172.16.10.108
stacklight_telemetry_node02_hostname: mtr02
- stacklight_telemetry_node03_address: 172.16.10.88
+ stacklight_telemetry_node03_address: 172.16.10.109
stacklight_telemetry_node03_hostname: mtr03
stacklight_version: '2'
static_ips_on_deploy_network_enabled: 'False'
@@ -134,4 +151,4 @@
tenant_network_subnet: 10.1.0.0/24
tenant_vlan: '20'
upstream_proxy_enabled: 'False'
- use_default_network_scheme: 'True'
+ use_default_network_scheme: 'False'