diff options
Diffstat (limited to 'deploy/adapters')
6 files changed, 13 insertions, 6 deletions
diff --git a/deploy/adapters/ansible/roles/database/templates/replica.js b/deploy/adapters/ansible/roles/database/templates/replica.js index d19db50d..dd5fc575 100644 --- a/deploy/adapters/ansible/roles/database/templates/replica.js +++ b/deploy/adapters/ansible/roles/database/templates/replica.js @@ -1,7 +1,7 @@ config = { _id:"compass", members:[ {% for host in haproxy_hosts.values() %} {% set pair = '%s:27017' % host %} - {_id:{{ loop.index0 }},host:"{{ pair }}",priority:{{ haproxy_hosts|length - loop.index0 }}}, + {_id:{{ loop.index0 }},host:"{{ pair }}",priority:{{ host_index[inventory_hostname] + 1 }}}, {% endfor %} ] }; 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 diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml index 1e8c7abd..7a75528a 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml @@ -194,7 +194,7 @@ # - { section: "DEFAULT", option: "auth_strategy", value: "keystone" } # - { section: "DEFAULT", option: "allow_overlapping_ips", value: "True" } - { section: "DEFAULT", option: "core_plugin", value: "neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2" } - - { section: "DEFAULT", option: "api_extensions_path", value: "extensions:/usr/lib/python2.7/dist-packages/neutron_plugin_contrail/extensions" } + - { section: "DEFAULT", option: "api_extensions_path", value: "/usr/lib/python2.7/dist-packages/neutron_plugin_contrail/extensions" } # - { section: "DEFAULT", option: "rabbit_host", value: "{{ contrail_haproxy_address }}" } # - { section: "DEFAULT", option: "rabbit_port", value: "5673" } # - { section: "DEFAULT", option: "service_plugins", value: "neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin" } diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml index 515b10e9..6758b8e7 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml @@ -17,14 +17,14 @@ - name: "set first cassandra host address" set_fact: # cassandra_addrs: "'{{ hostvars[item.1]['contrail_address'] }}'" - cassandra_addrs: "'{{ haproxy_hosts[item] }}'" + cassandra_addrs: "'{{ haproxy_hosts[item.1] }}'" with_indexed_items: groups['opencontrail_database'] when: item.0 == 0 - name: "set second or more cassandra host addresses" set_fact: # cassandra_addrs: "{{ cassandra_addrs }}, '{{ hostvars[item.1]['contrail_address'] }}'" - cassandra_addrs: "{{ cassandra_addrs }}, '{{ haproxy_hosts[item] }}'" + cassandra_addrs: "{{ cassandra_addrs }}, '{{ haproxy_hosts[item.1] }}'" with_indexed_items: groups['opencontrail_database'] when: item.0 > 0 diff --git a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml b/deploy/adapters/ansible/roles/open-contrail/vars/main.yml index 83eea5a3..4c8b73a7 100755 --- a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml +++ b/deploy/adapters/ansible/roles/open-contrail/vars/main.yml @@ -31,7 +31,7 @@ contrail_router_asn: "64512" ### Modify when need openstack provisioning keystone_provision: no install_nova: no -rabbit_password: {{ RABBIT_PASS }} +#rabbit_password: {{ RABBIT_PASS }} contrail_tor_agents: - name: "test01" |