Chery -pick changes in released branch
Change-Id: I89d2f16a33e68a28b55685ffd70039cefa7913b5
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml
index 23ee1d2..6c31575 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml
@@ -129,16 +129,15 @@
# pxe_interface_mac:
pxe_interface_mac: "0c:c4:7a:6c:83:56"
interfaces:
- one1:
+ enp9s0f0:
mac: "0c:c4:7a:6c:83:56"
mode: "static"
ip: "172.16.49.67"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "5.43.225.117"
- #power_pass: ==IPMI_PASS==
- power_password: ==IPMI_PASS==
+ power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
kvm02: # #cz7342-kvm.host-telecom.com
@@ -146,16 +145,15 @@
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:6c:84:2c"
interfaces:
- one1:
+ enp9s0f0:
mac: "0c:c4:7a:6c:84:2c"
mode: "static"
ip: "172.16.49.68"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "5.43.225.118"
- #power_pass: ==IPMI_PASS==
- power_password: ==IPMI_PASS==
+ power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
kvm03: # #cz7343-kvm.host-telecom.com
@@ -163,16 +161,15 @@
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:6c:83:54"
interfaces:
- one1:
+ enp9s0f0:
mac: "0c:c4:7a:6c:83:54"
mode: "static"
ip: "172.16.49.69"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "5.43.225.119"
- #power_pass: ==IPMI_PASS==
- power_password: ==IPMI_PASS==
+ power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
osd001: # #cz7343-kvm.host-telecom.com
@@ -180,33 +177,31 @@
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:55:6a:d4"
interfaces:
- one1:
+ enp2s0f0:
mac: "0c:c4:7a:55:6a:d4"
mode: "static"
ip: "172.16.49.70"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "185.8.59.243"
- #power_pass: ==IPMI_PASS==
- power_password: ==IPMI_PASS==
+ power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
osd002: # #cz7343-kvm.host-telecom.com
distro_series: "xenial"
# hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:55:6a:57"
+ pxe_interface_mac: "0c:c4:7a:55:6a:56"
interfaces:
- one1:
- mac: "0c:c4:7a:55:6a:57"
+ enp2s0f0:
+ mac: "0c:c4:7a:55:6a:56"
mode: "static"
ip: "172.16.49.71"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "185.8.59.244"
- #power_pass: ==IPMI_PASS==
- power_password: ==IPMI_PASS==
+ power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
osd003: # #cz7343-kvm.host-telecom.com
@@ -214,16 +209,15 @@
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:55:6a:2a"
interfaces:
- one1:
+ enp2s0f0:
mac: "0c:c4:7a:55:6a:2a"
mode: "static"
ip: "172.16.49.72"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "185.8.59.245"
- #power_pass: ==IPMI_PASS==
- power_password: ==IPMI_PASS==
+ power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
cmp001: # #cz7345-kvm.host-telecom.com
@@ -231,16 +225,15 @@
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:54:a2:5f"
interfaces:
- one2:
+ enp2s0f1:
mac: "0c:c4:7a:54:a2:5f"
mode: "static"
ip: "172.16.49.73"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "185.8.59.233"
- #power_pass: ==IPMI_PASS==
- power_password: ==IPMI_PASS==
+ power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
cmp002: # cz7346-kvm.host-telecom.com
@@ -248,19 +241,17 @@
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:54:a0:51"
interfaces:
- one2:
+ enp2s0f1:
mac: "0c:c4:7a:54:a0:51"
mode: "static"
ip: "172.16.49.74"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "185.8.59.232"
- #power_pass: ==IPMI_PASS==
- power_password: ==IPMI_PASS==
+ power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
-
mcp_common_scripts_branch: ''
mcp_version: proposed
offline_deployment: 'False'
@@ -293,8 +284,6 @@
openstack_cluster_size: compact
openstack_compute_count: '2'
openstack_compute_rack01_hostname: cmp
- openstack_compute_rack01_single_subnet: 10.167.8
- openstack_compute_rack01_tenant_subnet: 192.168.0
openstack_compute_single_address_ranges: 10.167.8.101-10.167.8.102
openstack_compute_deploy_address_ranges: 172.16.49.73-172.16.49.74
openstack_compute_tenant_address_ranges: 10.167.10.101-10.167.10.102
@@ -382,9 +371,9 @@
stacklight_telemetry_node03_hostname: mtr03
stacklight_version: '2'
static_ips_on_deploy_network_enabled: 'False'
- tenant_network_gateway: 192.168.0.220
+ tenant_network_gateway: 10.167.10.253
tenant_network_netmask: 255.255.255.0
- tenant_network_subnet: 192.168.0.0/24
+ tenant_network_subnet: 10.167.10.0/24
upstream_proxy_enabled: 'False'
use_default_network_scheme: 'True'
openldap_domain: cookied-bm-4.0-contrail.local
@@ -405,15 +394,11 @@
ceph_public_network: "10.167.8.0/24"
ceph_cluster_network: "10.167.8.0/24"
- # For compatibility with 2018.8.0
- ceph_osd_rack01_deploy_subnet: '172.16.49'
- ceph_osd_rack01_single_subnet: '10.167.8'
- ceph_osd_rack01_backend_subnet: '10.167.8'
-
# for 2018.11.0+
-# ceph_osd_deploy_address_ranges: "172.16.49.70-172.16.49.72"
-# ceph_osd_storage_address_ranges: "10.167.47.200-10.167.47.202"
-# ceph_osd_backend_address_ranges: "10.167.49.200-10.167.49.202"
+ ceph_osd_single_address_ranges: "10.167.8.200-10.167.8.202"
+ ceph_osd_deploy_address_ranges: "172.16.49.70-172.16.49.72"
+ ceph_osd_storage_address_ranges: "10.167.8.200-10.167.8.202"
+ ceph_osd_backend_address_ranges: "10.167.10.200-10.167.10.202"
ceph_osd_data_disks: "/dev/sdb"
ceph_osd_journal_or_block_db_disks: "/dev/sdb"
@@ -447,3 +432,6 @@
#ceph_rgw_node03_deploy_address: "172.16.48.78"
ceph_rgw_node03_address: "10.167.8.78"
ceph_rgw_node03_hostname: "rgw03"
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
+ barbican_integration_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-bm-os-contrail40-maas.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-bm-os-contrail40-maas.yaml
index 88e9a14..472600b 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-bm-os-contrail40-maas.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-bm-os-contrail40-maas.yaml
@@ -6,7 +6,7 @@
{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME','cookied-cicd-bm-os-contrail40-maas') %}
# Path to the context files used to render Cluster and Environment models
{%- set CLUSTER_CONTEXT_NAME = 'salt-context-cookiecutter-contrail.yaml' %}
-{%- set ENVIRONMENT_CONTEXT_NAMES = ['salt-context-environment.yaml','lab04-physical-inventory.yaml'] %}
+{%- set ENVIRONMENT_CONTEXT_NAMES = ['salt-context-environment.yaml','lab04-physical-inventory.yaml', 'salt-context-cookiecutter-contrail.yaml'] %}
{%- set CONTROL_VLAN = os_env('CONTROL_VLAN', '2422') %}
{%- set TENANT_VLAN = os_env('TENANT_VLAN', '2423') %}
@@ -40,13 +40,10 @@
{{ SHARED.MACRO_GENERATE_INVENTORY(RERUN_SALTMASTER_STATE=true) }}
-- description: Temporary WR for correct bridge name according to envoronment templates
+- description: Defining username and password params for IPMI access
cmd: |
- sed -i 's/==IPMI_USER==/${_param:power_user}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
- sed -i 's/==IPMI_PASS==/${_param:power_password}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
- # For 2018.11.0+ :
- # sed -i 's/==IPMI_USER==/${_param:power_user}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
- # sed -i 's/==IPMI_PASS==/${_param:power_password}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
+ sed -i 's/==IPMI_USER==/${_param:power_user}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
+ sed -i 's/==IPMI_PASS==/${_param:power_password}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 10}
skip_fail: false
@@ -56,22 +53,8 @@
set -e;
set -x;
. /root/venv-reclass-tools/bin/activate;
- reclass-tools add-key parameters._param.power_user {{ IPMI_USER }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
- reclass-tools add-key parameters._param.power_password {{ IPMI_PASS }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
- # For 2018.11.0+ :
- # reclass-tools add-key parameters._param.power_user {{ IPMI_USER }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
- # reclass-tools add-key parameters._param.power_password {{ IPMI_PASS }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: false
-
-- description: "Workaround of bug PROD-22286 for VCP image path (MCP 2018.8.0)"
- cmd: |
- set -e;
- set -x;
- . /root/venv-reclass-tools/bin/activate;
- reclass-tools add-key parameters._param.salt_control_xenial_image 'http://images.mcp.mirantis.net/ubuntu-16-04-x64-mcp{{ SHARED.REPOSITORY_SUITE }}.qcow2' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/init.yml;
- reclass-tools add-key parameters._param.salt_control_trusty_image 'http://images.mcp.mirantis.net/ubuntu-14-04-x64-mcp{{ SHARED.REPOSITORY_SUITE }}.qcow2' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/init.yml;
+ reclass-tools add-key parameters._param.power_user {{ IPMI_USER }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
+ reclass-tools add-key parameters._param.power_password {{ IPMI_PASS }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
@@ -82,27 +65,4 @@
sed -i 's/pgp_num: 128/pgp_num: 4/g' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/ceph/setup.yml;
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
- skip_fail: true
-
-- description: "Workaround for correct repositories for salt during maas bootstrap"
- cmd: |
- set -e;
- set -x;
- . /root/venv-reclass-tools/bin/activate;
- reclass-tools add-key parameters.maas.cluster.saltstack_repo_key '${linux:system:repo:mcp_saltstack:key}' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
- reclass-tools add-key parameters.maas.cluster.saltstack_repo_trusty 'deb [arch=amd64] ${_param:linux_system_repo_mcp_saltstack_url}/trusty/ trusty main' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
- reclass-tools add-key parameters.maas.cluster.saltstack_repo_xenial 'deb [arch=amd64] ${_param:linux_system_repo_mcp_saltstack_url}/xenial/ xenial main' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: false
-
-- description: "Workaround of hardcoded apt_mk_version in docker repo"
- cmd: |
- set -e;
- set -x;
- . /root/venv-reclass-tools/bin/activate;
- reclass-tools add-key 'classes' 'system.linux.system.repo.mcp.apt_mirantis.docker' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control_init.yml;
- reclass-tools add-key parameters._param.apt_mk_version {{ SHARED.REPOSITORY_SUITE }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control_init.yml;
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: false
+ skip_fail: true
\ No newline at end of file