Fix queens deploy
Change-Id: I15447ff8e27781a5a604234ce746815d97cb4dc4
diff --git a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml
index 8c02c8e..343a4e6 100644
--- a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml
+++ b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml
@@ -63,16 +63,16 @@
gateway_primary_second_nic: eth2
infra_bond_mode: active-backup
infra_deploy_nic: eth0
- infra_kvm01_control_address: 10.167.4.241
- infra_kvm01_deploy_address: 10.167.5.91
+ infra_kvm01_control_address: 10.167.4.101
+ infra_kvm01_deploy_address: 10.167.5.101
infra_kvm01_hostname: kvm01
- infra_kvm02_control_address: 10.167.4.242
- infra_kvm02_deploy_address: 10.167.5.92
+ infra_kvm02_control_address: 10.167.4.102
+ infra_kvm02_deploy_address: 10.167.5.102
infra_kvm02_hostname: kvm02
- infra_kvm03_control_address: 10.167.4.243
- infra_kvm03_deploy_address: 10.167.5.93
+ infra_kvm03_control_address: 10.167.4.103
+ infra_kvm03_deploy_address: 10.167.5.103
infra_kvm03_hostname: kvm03
- infra_kvm_vip_address: 10.167.4.240
+ infra_kvm_vip_address: 10.167.4.100
infra_primary_first_nic: eth1
infra_primary_second_nic: eth2
kubernetes_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml
index 59e20b9..9b325ae 100644
--- a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml
+++ b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml
@@ -12,39 +12,6 @@
ens4:
role: single_static_ctl
- kvm01:
- reclass_storage_name: infra_kvm_node01
- roles:
- - infra_kvm
- - linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_dhcp
- ens4:
- role: single_ctl
-
- kvm02:
- reclass_storage_name: infra_kvm_node02
- roles:
- - infra_kvm
- - linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_dhcp
- ens4:
- role: single_ctl
-
- kvm03:
- reclass_storage_name: infra_kvm_node03
- roles:
- - infra_kvm
- - linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_dhcp
- ens4:
- role: single_ctl
-
cid01:
reclass_storage_name: cicd_control_node01
roles:
@@ -81,10 +48,10 @@
ctl01:
reclass_storage_name: openstack_control_node01
roles:
+ - infra_kvm
- openstack_control_leader
- openstack_database_leader
- openstack_message_queue
- - features_lvm_backend_control
- linux_system_codename_xenial
interfaces:
ens3:
@@ -95,10 +62,10 @@
ctl02:
reclass_storage_name: openstack_control_node02
roles:
+ - infra_kvm
- openstack_control
- openstack_database
- openstack_message_queue
- - features_lvm_backend_control
- linux_system_codename_xenial
interfaces:
ens3:
@@ -109,10 +76,10 @@
ctl03:
reclass_storage_name: openstack_control_node03
roles:
+ - infra_kvm
- openstack_control
- openstack_database
- openstack_message_queue
- - features_lvm_backend_control
- linux_system_codename_xenial
interfaces:
ens3:
diff --git a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/salt.yaml b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/salt.yaml
index 62a8a23..b4c01a8 100644
--- a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/salt.yaml
+++ b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/salt.yaml
@@ -9,17 +9,6 @@
{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
-- description: "Workaround to avoid reboot cmp nodes: apply patch to bring OVS interfaces UP (PROD-24343)"
- cmd: |
- set -ex
- git clone https://gerrit.mcp.mirantis.com/salt-formulas/linux /root/salt-formula-linux
- cd /root/salt-formula-linux
- git fetch https://gerrit.mcp.mirantis.com/salt-formulas/linux refs/changes/32/29432/11 && git checkout FETCH_HEAD
- cp -r /root/salt-formula-linux/linux/ /srv/salt/env/prd/
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 10}
- skip_fail: false
-
{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
diff --git a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/underlay.yaml b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/underlay.yaml
index 154c5c6..438ee51 100644
--- a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/underlay.yaml
+++ b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/underlay.yaml
@@ -13,9 +13,6 @@
{% set LAB_CONFIG_NAME = os_env('LAB_CONFIG_NAME', 'cookied-cicd-queens-dvr-sl') %}
{% set DOMAIN_NAME = os_env('DOMAIN_NAME', LAB_CONFIG_NAME) + '.local' %}
{% set HOSTNAME_CFG01 = os_env('HOSTNAME_CFG01', 'cfg01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_KVM01 = os_env('HOSTNAME_KVM01', 'kvm01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_KVM02 = os_env('HOSTNAME_KVM02', 'kvm02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_KVM03 = os_env('HOSTNAME_KVM03', 'kvm03.' + DOMAIN_NAME) %}
{% set HOSTNAME_CID01 = os_env('HOSTNAME_CID01', 'cid01.' + DOMAIN_NAME) %}
{% set HOSTNAME_CID02 = os_env('HOSTNAME_CID02', 'cid02.' + DOMAIN_NAME) %}
{% set HOSTNAME_CID03 = os_env('HOSTNAME_CID03', 'cid03.' + DOMAIN_NAME) %}
@@ -48,10 +45,6 @@
gateway: +1
l2_network_device: +1
default_{{ HOSTNAME_CFG01 }}: +15
- default_{{ HOSTNAME_KVM }}: +240
- default_{{ HOSTNAME_KVM01 }}: +241
- default_{{ HOSTNAME_KVM02 }}: +242
- default_{{ HOSTNAME_KVM03 }}: +243
default_{{ HOSTNAME_CID }}: +90
default_{{ HOSTNAME_CID01 }}: +91
default_{{ HOSTNAME_CID02 }}: +92
@@ -82,10 +75,6 @@
gateway: +1
l2_network_device: +1
default_{{ HOSTNAME_CFG01 }}: +15
- default_{{ HOSTNAME_KVM }}: +240
- default_{{ HOSTNAME_KVM01 }}: +241
- default_{{ HOSTNAME_KVM02 }}: +242
- default_{{ HOSTNAME_KVM03 }}: +243
default_{{ HOSTNAME_CID }}: +90
default_{{ HOSTNAME_CID01 }}: +91
default_{{ HOSTNAME_CID02 }}: +92
@@ -727,84 +716,6 @@
interfaces: *all_interfaces
network_config: *all_network_config
- - name: {{ HOSTNAME_KVM01 }}
- role: salt_minion
- params:
- vcpu: {{ os_env('KVM_NODE_CPU', 1) }}
- memory: {{ os_env('KVM_NODE_MEMORY', 1024) }}
- boot:
- - hd
- cloud_init_volume_name: iso
- cloud_init_iface_up: ens3
- volumes:
- - name: system
- capacity: {{ os_env('KVM_NODE_VOLUME_SIZE', 150) }}
- backing_store: mcp_ubuntu_1604_image
- format: qcow2
- - name: iso # Volume with name 'iso' will be used
- # for store image with cloud-init metadata.
- capacity: 1
- format: raw
- device: cdrom
- bus: ide
- cloudinit_meta_data: *cloudinit_meta_data
- cloudinit_user_data: *cloudinit_user_data_1604_swp
-
- interfaces: *interfaces
- network_config: *network_config
-
- - name: {{ HOSTNAME_KVM02 }}
- role: salt_minion
- params:
- vcpu: {{ os_env('KVM_NODE_CPU', 1) }}
- memory: {{ os_env('KVM_NODE_MEMORY', 1024) }}
- boot:
- - hd
- cloud_init_volume_name: iso
- cloud_init_iface_up: ens3
- volumes:
- - name: system
- capacity: {{ os_env('KVM_NODE_VOLUME_SIZE', 150) }}
- backing_store: mcp_ubuntu_1604_image
- format: qcow2
- - name: iso # Volume with name 'iso' will be used
- # for store image with cloud-init metadata.
- capacity: 1
- format: raw
- device: cdrom
- bus: ide
- cloudinit_meta_data: *cloudinit_meta_data
- cloudinit_user_data: *cloudinit_user_data_1604_swp
-
- interfaces: *interfaces
- network_config: *network_config
-
- - name: {{ HOSTNAME_KVM03 }}
- role: salt_minion
- params:
- vcpu: {{ os_env('KVM_NODE_CPU', 1) }}
- memory: {{ os_env('KVM_NODE_MEMORY', 1024) }}
- boot:
- - hd
- cloud_init_volume_name: iso
- cloud_init_iface_up: ens3
- volumes:
- - name: system
- capacity: {{ os_env('KVM_NODE_VOLUME_SIZE', 150) }}
- backing_store: mcp_ubuntu_1604_image
- format: qcow2
- - name: iso # Volume with name 'iso' will be used
- # for store image with cloud-init metadata.
- capacity: 1
- format: raw
- device: cdrom
- bus: ide
- cloudinit_meta_data: *cloudinit_meta_data
- cloudinit_user_data: *cloudinit_user_data_1604_swp
-
- interfaces: *interfaces
- network_config: *network_config
-
- name: {{ HOSTNAME_CID01 }}
role: salt_minion
params:
diff --git a/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-queens-dvr-sl.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-queens-dvr-sl.yaml
index 505e6e7..1bda65e 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-queens-dvr-sl.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-queens-dvr-sl.yaml
@@ -21,10 +21,10 @@
- description: "Workaround for combined roles: remove unnecessary classes"
cmd: |
set -e;
+ sed -i '/system.reclass.storage.system.physical_control_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config/init.yml;
sed -i '/system.reclass.storage.system.openstack_database_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config/init.yml;
sed -i '/system.reclass.storage.system.openstack_message_queue_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config/init.yml;
- # sed -i '/system.reclass.storage.system.stacklight_telemetry_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config/init.yml;
- # sed -i '/system.reclass.storage.system.stacklight_log_cluster/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config/init.yml;
+ sed -i '/system.salt.control.placement.openstack.compact/d' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/kvm.yml;
# salt-call reclass.cluster_meta_set name='openstack_dns_node01_address' value='{{ SHARED.IPV4_NET_CONTROL_PREFIX }}.111' file_name=/srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/openstack/init.yml
# salt-call reclass.cluster_meta_set name='openstack_dns_node02_address' value='{{ SHARED.IPV4_NET_CONTROL_PREFIX }}.112' file_name=/srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/openstack/init.yml
@@ -32,6 +32,9 @@
# salt-call reclass.cluster_meta_set name='salt_master_host' value='${_param:infra_config_deploy_address}' file_name=/srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/openstack/init.yml
. /root/venv-reclass-tools/bin/activate;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config/init.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config/init.yml;
+ reclass-tools del-key parameters.reclass.storage.node.infra_kvm_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config/init.yml;
reclass-tools del-key parameters.reclass.storage.node.openstack_database_node01 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config/init.yml;
reclass-tools del-key parameters.reclass.storage.node.openstack_database_node02 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config/init.yml;
reclass-tools del-key parameters.reclass.storage.node.openstack_database_node03 /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config/init.yml;
@@ -44,12 +47,4 @@
retry: {count: 1, delay: 5}
skip_fail: false
-- description: "Temporary workaround: remove cinder-volume from CTL nodes"
- cmd: |
- sed -i 's/\-\ system\.cinder\.volume\.single//g' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/openstack/control.yml;
- sed -i 's/\-\ system\.cinder\.volume\.notification\.messagingv2//g' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/openstack/control.yml;
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: true
-
{{ SHARED.MACRO_GENERATE_INVENTORY(RERUN_SALTMASTER_STATE=true) }}