diff options
| author |   carey.xu <carey.xuhan@huawei.com> | 2016-01-11 16:44:59 +0800 |
|---|---|---|
| committer |   Justin chi <chigang@huawei.com> | 2016-01-13 04:49:21 +0000 |
| commit | f17596eac0ff7b9249f5709eb3cb930e571bbe99 (patch) | |
| tree | 9b1e6594b7b85d75266df52259157312b874a052 /deploy/adapters | |
| parent | d3b61b5a34d699871099dfc3562456e43e6e6236 (diff) | |
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>
(cherry picked from commit 94035e341ff51daf1b1a5ed297f78b8bcbf71882)
Diffstat (limited to 'deploy/adapters')
| -rw-r--r-- | deploy/adapters/ansible/roles/ha/templates/haproxy.cfg | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/neutron-network/tasks/main.yml | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg b/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg index 5f0679ff..1bca5e39 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 |