create a virtual port on jumpserver for functest

  - create a virtual port on jumpserver, for functest communicate with openstack admin network
  - force mtu to 1450 when vxlan mode
  - make only one mysql node primary(bug workaround)

JIRA: COMPASS-243

Change-Id: I498ed05f4b1b64f4f4db2455dd58dd2b4e82ae82
Signed-off-by: carey.xu <carey.xuhan@huawei.com>

4 files changed, 15 insertions, 8 deletions

diff --git a/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg b/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg
index edbd998d..38a113ef 100644
--- a/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg
+++ b/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg
@@ -34,7 +34,7 @@ listen  proxy-mysql
 {% if loop.index == 1 %}
     server {{ host }} {{ ip }}:3306 weight 1 check inter 2000 rise 2 fall 5
 {% else %}
-    server {{ host }} {{ ip }}:3306 weight 1 check inter 2000 rise 2 fall 5
+    server {{ host }} {{ ip }}:3306 weight 1 check inter 2000 rise 2 fall 5 backup
 {% endif %}
 {% endfor %}
 
diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml
index a3a62b11..bb6b952b 100644
--- a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml
@@ -65,6 +65,13 @@
   template: src=templates/neutron.conf
             dest=/etc/neutron/neutron.conf backup=yes
 
+- name: force mtu to 1450 for vxlan
+  lineinfile:
+    dest: /etc/neutron/dnsmasq-neutron.conf
+    regexp: '^dhcp-option-force'
+    line: 'dhcp-option-force=26,1450'
+  when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES }}"
+
 - include: firewall.yml
   when: enable_fwaas == True
 
diff --git a/deploy/network.sh b/deploy/network.sh
index e76fd926..9e0cfa8c 100755
--- a/deploy/network.sh
+++ b/deploy/network.sh
@@ -58,7 +58,7 @@ function setup_bridge_external()
     sudo virsh net-define $WORK_DIR/network/external.xml
     sudo virsh net-start external
 
-    sudo python $COMPASS_DIR/deploy/setup_vnic.py
+    python $COMPASS_DIR/deploy/setup_vnic.py
 }
 
 function setup_nat_net() {
diff --git a/deploy/setup_vnic.py b/deploy/setup_vnic.py
index 39623031..8e14765f 100644
--- a/deploy/setup_vnic.py
+++ b/deploy/setup_vnic.py
@@ -3,17 +3,17 @@ import os
 import yaml
 
 if __name__ == "__main__":
-    network_config_file = "/home/carey/nfv/compass4nfv/deploy/conf/network_cfg.yaml"#os.environ["NETWORK"]
+    network_config_file = os.environ["NETWORK"]
     network_config = yaml.load(open(network_config_file, "r"))
-    os.system("ovs-vsctl --may-exist add-port br-external mgmt_vnic -- set Interface mgmt_vnic type=internal")
-    os.system("ip addr flush mgmt_vnic")
-    os.system("ip link set mgmt_vnic up")
+    os.system("sudo ovs-vsctl --may-exist add-port br-external mgmt_vnic -- set Interface mgmt_vnic type=internal")
+    os.system("sudo ip addr flush mgmt_vnic")
+    os.system("sudo ip link set mgmt_vnic up")
     for sys_intf in network_config["sys_intf_mappings"]:
         if sys_intf["name"] == "mgmt" and sys_intf.get("vlan_tag"):
-            os.system("ovs-vsctl set port mgmt_vnic tag=%s" % sys_intf["vlan_tag"])
+            os.system("sudo ovs-vsctl set port mgmt_vnic tag=%s" % sys_intf["vlan_tag"])
 
     for net_info in network_config["ip_settings"]:
         if net_info["name"] == "mgmt":
             mgmt_ip_range_end= net_info["ip_ranges"][0][1]
             mgmt_netmask = net_info["cidr"].split('/')[1]
-            os.system(r"ip addr add %s/%s dev mgmt_vnic" % (mgmt_ip_range_end, mgmt_netmask))
+            os.system(r"sudo ip addr add %s/%s dev mgmt_vnic" % (mgmt_ip_range_end, mgmt_netmask))