Merge "Fix e7-odl not included parameters"
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/infra_config_nodes_add.yml b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/infra_config_nodes_add.yml
index f4af00f..ef9bf79 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/infra_config_nodes_add.yml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/infra_config_nodes_add.yml
@@ -11,3 +11,7 @@
infra_kvm_node03:
params:
tenant_address: 10.167.12.243
+ opendaylight_control_node01:
+ params:
+ salt_master_host: 172.16.162.66
+ single_address: 10.167.11.220
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
index f5adc5a..48fd995 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
@@ -185,13 +185,6 @@
mount: '/'
sdb:
type: physical
- cinder-vg:
- type: lvm
- devices:
- - sdb
- volume:
- cinder-volumes-pool:
- size: 800G
power_parameters:
power_address: "5.43.227.11"
power_pass: ==IPMI_PASS==
@@ -238,13 +231,6 @@
size: 800G
sdb:
type: physical
- cinder-vg:
- type: lvm
- devices:
- - sdb
- volume:
- cinder-volumes-pool:
- size: 800G
power_parameters:
power_address: "5.43.227.19"
power_pass: ==IPMI_PASS==
diff --git a/tcp_tests/templates/cookied-model-generator/salt_bm-e7-cicd-pike-odl-maas.yaml b/tcp_tests/templates/cookied-model-generator/salt_bm-e7-cicd-pike-odl-maas.yaml
index be0aeef..bf5df0c 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_bm-e7-cicd-pike-odl-maas.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_bm-e7-cicd-pike-odl-maas.yaml
@@ -41,6 +41,35 @@
retry: {count: 1, delay: 10}
skip_fail: false
+- description: "Add OpenDayLight as Neutron backend"
+ cmd: |
+ set -e;
+ set -x;
+ . /root/venv-reclass-tools/bin/activate;
+ reclass-tools add-key --merge classes service.neutron.compute.opendaylight.single /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/compute/init.yml
+ reclass-tools add-key --merge classes service.neutron.gateway.opendaylight.single /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/gateway.yml
+ reclass-tools add-key --merge classes system.neutron.control.opendaylight.cluster /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control.yml
+ reclass-tools add-key parameters.neutron.server.backend.rest_api_port 8282 /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control.yml
+ reclass-tools add-key parameters.neutron.server.backend.user admin /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control.yml
+ reclass-tools add-key parameters.neutron.server.backend.password admin /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control.yml
+ reclass-tools add-key parameters._param.opendaylight_service_host {{ ODL_CONTROLLER_IP }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/init.yml
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
+
+- description: Add opendaylight control single class
+ cmd: |
+ set -e;
+ set -x;
+ . /root/venv-reclass-tools/bin/activate;
+ reclass-tools add-key --merge parameters.reclass.storage.node.opendaylight_control_node01.classes system.reclass.storage.system.opendaylight_control_single /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config/nodes.yml;
+ sed -i 's/ system.reclass.storage.system.opendaylight_control_single/\n \- system.reclass.storage.system.opendaylight_control_single/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config/nodes.yml
+ reclass-tools add-key --merge parameters.reclass.storage.node.opendaylight_control_node01.classes cluster.{{ LAB_CONFIG_NAME }}.infra /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config/nodes.yml;
+ salt '*' saltutil.refresh_pillar;
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 10}
+ skip_fail: false
+
{{ SHARED.MACRO_GENERATE_INVENTORY(RERUN_SALTMASTER_STATE=true) }}
- description: Defining username and password params for IPMI access
@@ -79,22 +108,6 @@
retry: {count: 1, delay: 5}
skip_fail: false
-- description: "Add OpenDayLight as Neutron backend"
- cmd: |
- set -e;
- set -x;
- . /root/venv-reclass-tools/bin/activate;
- reclass-tools add-key --merge classes service.neutron.compute.opendaylight.single /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/compute/init.yml
- reclass-tools add-key --merge classes service.neutron.gateway.opendaylight.single /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/gateway.yml
- reclass-tools add-key --merge classes system.neutron.control.opendaylight.cluster /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control.yml
- reclass-tools add-key parameters.neutron.server.backend.rest_api_port 8282 /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control.yml
- reclass-tools add-key parameters.neutron.server.backend.user admin /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control.yml
- reclass-tools add-key parameters.neutron.server.backend.password admin /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control.yml
- reclass-tools add-key parameters._param.opendaylight_service_host {{ ODL_CONTROLLER_IP }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/init.yml
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: false
-
- description: "Upload env_add.yml to cfg01.{{ DOMAIN_NAME }}"
upload:
local_path: {{ config.salt_deploy.templates_dir }}{{ LAB_CONFIG_NAME }}/