| commit | 2b3f0279c01e65f13022031ee50edec3581652ef | [log] [tgz] |
|---|---|---|
| author | Tatyana Leontovich <tleontovich@mirantis.com> | Thu Apr 06 17:22:04 2017 +0300 |
| committer | Tatyana Leontovich <tleontovich@mirantis.com> | Thu Apr 06 18:02:50 2017 +0300 |
| tree | 9c422a3475c475f4f1019579158c074adc794709 | |
| parent | e914bd71ac5d526caef77ca7782069a84e19be93 [diff] | |
| parent | efb3f0bb85bba7dccc2dfd4863fc78265100c450 [diff] |
Merge branch 'add_1_0' of https://github.com/Mirantis/tcp-qa into add_1_0
diff --git a/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1404.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1404.yaml index 8ed34dc..d139bb1 100644 --- a/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1404.yaml +++ b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1404.yaml
@@ -65,7 +65,7 @@ # To be configured from inventory/fuel-devops by operator or autotests - 'echo "id: {hostname}" >> /etc/salt/minion' - - 'echo "master: 172.16.10.100" >> /etc/salt/minion' + - 'echo "master: 192.168.10.100" >> /etc/salt/minion' - echo "Restarting minion service with workarounds..." - rm -f /etc/salt/pki/minion/minion_master.pub
diff --git a/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml index 26c21d8..dc7fe5d 100644 --- a/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml +++ b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml
@@ -73,7 +73,7 @@ # To be configured from inventory/fuel-devops by operator or autotests - 'echo "id: {hostname}" >> /etc/salt/minion' - - 'echo "master: 172.16.10.100" >> /etc/salt/minion' + - 'echo "master: 192.168.10.100" >> /etc/salt/minion' - echo "Restarting minion service with workarounds..." - rm -f /etc/salt/pki/minion/minion_master.pub @@ -93,5 +93,4 @@ content: | auto ens3 iface ens3 inet dhcp - auto ens4 - iface ens4 inet dhcp +