Update B300-E7 model
PROD-37077
Change-Id: Ic3d79a338e88864e40d2cacd4c656012d9ed84c2
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/salt.yaml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/salt.yaml
index 8c732dd..8f82d77 100755
--- a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/salt.yaml
+++ b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/salt.yaml
@@ -88,8 +88,46 @@
set -x;
set -e;
salt 'kvm01*' cmd.run 'sysctl -w net.ipv4.ip_forward=1';
- ip route add 10.167.11.0/24 via 172.16.162.67;
+ ip route add 10.167.10.0/23 via 172.16.162.67;
sed -i 's/er: 1/er: 0/g' /srv/salt/reclass/classes/service/linux/system/cis/cis-3-2-7.yml;
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
+
+- description: Create an alias to ens3 and NAT for the new net
+ cmd: |
+ set -x;
+ set -e;
+ iptables -t nat -I POSTROUTING -s 10.200.200.0/23 -j MASQUERADE;
+ ip addr add 10.200.200.1/23 dev ens3
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
+
+- description: "Upload maas_subnet_add.yml to cfg01.{{ DOMAIN_NAME }}"
+ upload:
+ local_path: {{ config.salt_deploy.templates_dir }}{{ LAB_CONFIG_NAME }}/
+ local_filename: maas_subnet_add.yml
+ remote_path: /root/
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 10}
+ skip_fail: false
+
+- description: "Modify model to add the new MAAS network"
+ cmd: |
+ set -e;
+ set -x;
+ . /root/venv-reclass-tools/bin/activate;
+ reclass-tools merge-context /root/maas_subnet_add.yml /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
+
+- description: "Rerun maas.region state"
+ cmd: |
+ set -e;
+ set -x;
+ salt 'cfg01*' state.sls maas.region
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false