Fix baremetal models
Change-Id: Ica4cbc307b166e57b1a03d517510495816cc88fe
diff --git a/tcp_tests/templates/cookied-bm-dpdk-pipeline/post.yaml b/tcp_tests/templates/cookied-bm-dpdk-pipeline/post.yaml
index 61b1bd4..fd07061 100644
--- a/tcp_tests/templates/cookied-bm-dpdk-pipeline/post.yaml
+++ b/tcp_tests/templates/cookied-bm-dpdk-pipeline/post.yaml
@@ -35,7 +35,7 @@
- description: Create net04
cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'ctl01*' cmd.run
- '. /root/keystonercv3; neutron net-create net04 --provider:network_type vxlan'
+ '. /root/keystonercv3; neutron net-create net04 --provider:network_type flat'
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 30}
skip_fail: false
diff --git a/tcp_tests/templates/cookied-bm-dpdk-pipeline/salt-context-cookiecutter-openstack_ovs_dpdk.yaml b/tcp_tests/templates/cookied-bm-dpdk-pipeline/salt-context-cookiecutter-openstack_ovs_dpdk.yaml
index 72c8bf4..0d9e84c 100644
--- a/tcp_tests/templates/cookied-bm-dpdk-pipeline/salt-context-cookiecutter-openstack_ovs_dpdk.yaml
+++ b/tcp_tests/templates/cookied-bm-dpdk-pipeline/salt-context-cookiecutter-openstack_ovs_dpdk.yaml
@@ -77,7 +77,7 @@
control_network_netmask: 255.255.255.0
control_network_subnet: 10.167.11.0/24
control_vlan: '2416'
- cookiecutter_template_branch: master
+ cookiecutter_template_branch: proposed
cookiecutter_template_credentials: gerrit
cookiecutter_template_url: https://gerrit.mcp.mirantis.net/mk/cookiecutter-templates.git
deploy_network_gateway: 172.16.49.62
@@ -161,12 +161,14 @@
openstack_nfv_sriov_enabled: 'True'
openstack_nova_compute_hugepages_count: '16'
openstack_nova_compute_nfv_req_enabled: 'True'
- openstack_nfv_sriov_network: physnet1
+ openstack_nfv_sriov_network: physnet2
openstack_nfv_sriov_numvfs: '7'
openstack_nfv_sriov_pf_nic: enp5s0f1
openstack_nova_cpu_pinning: 6,7,8,9,10,11
+ openstack_nova_compute_reserved_host_memory_mb: '900'
openstack_ovs_dvr_enabled: 'False'
- openstack_ovs_encapsulation_type: vxlan
+ openstack_ovs_encapsulation_type: vlan
+ openstack_ovs_encapsulation_vlan_range: 2418:2420
openstack_proxy_address: 10.167.11.80
openstack_proxy_hostname: prx
openstack_proxy_node01_address: 10.167.11.81
@@ -187,7 +189,7 @@
salt_master_address: 10.167.11.2
salt_master_hostname: cfg01
salt_master_management_address: 172.16.49.2
- shared_reclass_branch: master
+ shared_reclass_branch: proposed
shared_reclass_url: https://gerrit.mcp.mirantis.net/salt-models/reclass-system.git
stacklight_enabled: 'False'
stacklight_version: '2'
@@ -197,4 +199,5 @@
tenant_network_subnet: 10.167.12.0/24
tenant_vlan: '2417'
upstream_proxy_enabled: 'False'
- use_default_network_scheme: 'True'
\ No newline at end of file
+ use_default_network_scheme: 'True'
+ sriov_network_subnet: 192.168.10.0/24
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-bm-dpdk-pipeline/salt.yaml b/tcp_tests/templates/cookied-bm-dpdk-pipeline/salt.yaml
index 3272f97..8a6d342 100644
--- a/tcp_tests/templates/cookied-bm-dpdk-pipeline/salt.yaml
+++ b/tcp_tests/templates/cookied-bm-dpdk-pipeline/salt.yaml
@@ -33,13 +33,14 @@
{{ SHARED.MACRO_RUN_SALT_MASTER_UNDERLAY_STATES() }}
-- description: "WR for changing image to proposed"
+- description: "WR for changing VCP images path to internal storage"
cmd: |
set -e;
- # Add message_queu host for opencontrail
+ apt-get -y install python-virtualenv python-pip build-essential python-dev libssl-dev;
+ [[ -d /root/venv-reclass-tools ]] || virtualenv /root/venv-reclass-tools;
. /root/venv-reclass-tools/bin/activate;
- reclass-tools add-key parameters._param.salt_control_xenial_image 'http://ci.mcp.mirantis.net:8085/images/ubuntu-16-04-x64-mcp{{ 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://ci.mcp.mirantis.net:8085/images/ubuntu-14-04-x64-mcp{{ REPOSITORY_SUITE }}.qcow2' /srv/salt/reclass/classes/cluster//{{ LAB_CONFIG_NAME }}infra/init.yml;
+ pip install git+https://github.com/dis-xcom/reclass-tools;
+ reclass-tools add-key parameters._param.salt_control_xenial_image 'https://apt.mcp.mirantis.net/images/ubuntu-16-04-x64-mcp{{ SHARED.REPOSITORY_SUITE }}.qcow2' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/init.yml;
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 10}
skip_fail: false