Change compute generation from rack
Change-Id: I02bf9efc6fce6590fbfc8c31e1878c3c1ee0775b
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/lab04-upgrade-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/lab04-upgrade-physical-inventory.yaml
index 9cf1366..7c01fe1 100644
--- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/lab04-upgrade-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/lab04-upgrade-physical-inventory.yaml
@@ -81,28 +81,39 @@
role: single_vlan_ctl
single_address: 10.167.8.237
- cmp001.bm-mcp-pike-k8s-contrail.local:
- reclass_storage_name: kubernetes_compute_node001
+ cmp<<count>>:
+ reclass_storage_name: kubernetes_compute_rack01
roles:
- - linux_system_codename_xenial
- kubernetes_compute_contrail
+ - linux_system_codename_xenial
- salt_master_host
interfaces:
enp9s0f0:
role: single_dhcp
ens11f1:
role: k8s_oc40_only_vhost_on_control_vlan
- single_address: 10.167.8.103
-
- cmp002.bm-mcp-pike-k8s-contrail.local:
- reclass_storage_name: kubernetes_compute_node002
- roles:
- - linux_system_codename_xenial
- - kubernetes_compute_contrail
- - salt_master_host
- interfaces:
- enp9s0f0:
- role: single_dhcp
- ens11f1:
- role: k8s_oc40_only_vhost_on_control_vlan
- single_address: 10.167.8.104
+ # cmp001.bm-mcp-pike-k8s-contrail.local:
+ # reclass_storage_name: kubernetes_compute_node001
+ # roles:
+ # - linux_system_codename_xenial
+ # - kubernetes_compute_contrail
+ # - salt_master_host
+ # interfaces:
+ # enp9s0f0:
+ # role: single_dhcp
+ # ens11f1:
+ # role: k8s_oc40_only_vhost_on_control_vlan
+ # single_address: 10.167.8.103
+ #
+ # cmp002.bm-mcp-pike-k8s-contrail.local:
+ # reclass_storage_name: kubernetes_compute_node002
+ # roles:
+ # - linux_system_codename_xenial
+ # - kubernetes_compute_contrail
+ # - salt_master_host
+ # interfaces:
+ # enp9s0f0:
+ # role: single_dhcp
+ # ens11f1:
+ # role: k8s_oc40_only_vhost_on_control_vlan
+ # single_address: 10.167.8.104
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml
index 53bf0bb..570000a 100644
--- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml
@@ -107,8 +107,9 @@
infra_primary_second_nic: eth2
kubernetes_enabled: 'True'
kubernetes_compute_count: 2
- kubernetes_compute_rack01_single_subnet: 10.167.8
- kubernetes_compute_rack01_tenant_subnet: 10.167.8
+ kubernetes_compute_rack01_hostname: cmp
+ kubernetes_compute_single_address_ranges: 10.167.8.103-10.167.8.104
+ kubernetes_compute_tenant_address_ranges: 10.167.8.103-10.167.8.104
kubernetes_network_opencontrail_enabled: 'True'
local_repositories: 'False'
maas_deploy_address: 172.16.49.66
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt.yaml b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt.yaml
index 2da8e46..a772448 100644
--- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt.yaml
@@ -30,16 +30,6 @@
{{ SHARED.MACRO_RUN_SALT_MASTER_UNDERLAY_STATES() }}
-- description: "Workaround for rack01 compute generator"
- cmd: |
- set -e;
- # Remove rack01 key
- . /root/venv-reclass-tools/bin/activate;
- reclass-tools del-key parameters.reclass.storage.node.kubernetes_compute_rack01 /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config/init.yml;
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 10}
- skip_fail: false
-
- description: "Change path to internal storage for salt.control images"
cmd: |
set -e;