Dissociate cookied-cicd-bm-os-contrail40-maas from 2018.8.0 release
Change-Id: I18f02f846e7b632d04940fc2256cff61595e6a92
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..cb30db6 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
@@ -133,12 +133,11 @@
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
@@ -150,12 +149,11 @@
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
@@ -167,12 +165,11 @@
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
@@ -184,12 +181,11 @@
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
@@ -201,12 +197,11 @@
mac: "0c:c4:7a:55:6a:57"
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
@@ -218,12 +213,11 @@
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
@@ -235,12 +229,11 @@
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
@@ -252,12 +245,11 @@
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==
@@ -293,8 +285,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
@@ -405,15 +395,10 @@
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_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_data_disks: "/dev/sdb"
ceph_osd_journal_or_block_db_disks: "/dev/sdb"
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-environment.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-environment.yaml
index 9c9d048..3c38fc6 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-environment.yaml
@@ -25,16 +25,18 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_ctl
- ctl01.cookied-bm-mcp-ocata-contrail.local:
- reclass_storage_name: openstack_control_node01
- roles:
- - openstack_control_leader
- - linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_ctl
+ ctl01.cookied-bm-mcp-ocata-contrail.local:
+ reclass_storage_name: openstack_control_node01
+ roles:
+ - openstack_control_leader
+ - linux_system_codename_xenial
+ classes:
+ - system.linux.system.repo.mcp.apt_mirantis.docker
+ interfaces:
+ ens3:
+ role: single_ctl
ctl02.cookied-bm-mcp-ocata-contrail.local:
reclass_storage_name: openstack_control_node02
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt.yaml
index 9a571ba..4ea0035 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt.yaml
@@ -19,14 +19,6 @@
{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
-- description: Prepare maas
- cmd: |
- salt-call state.sls maas.cluster;
- salt-call state.sls maas.region;
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 2, delay: 5}
- skip_fail: false
-
- description: Generate a public key for machines in MAAS
cmd: |
ssh-keygen -y -f ~root/.ssh/id_rsa > ~root/.ssh/id_rsa.pub