From 3bc3a8828c3ceefedd08e1767ae6e3bf2df9ac22 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Wed, 23 Aug 2017 15:05:02 +0800 Subject: Support multiple physnet mapping JIRA: COMPASS-559 1. support multiple mapping in provider_net_mappings of network.yml and create corresponding ovs bridges 2. support seperate config in sys_intf_mappings of network.yml 3. remove linux bridges in compute nodes for ovs port binding convenience 4. support openstack vlan tenant network 5. modify odl and odl_sfc roles to use configurable provider mapping 6. remove some hard coding Change-Id: Ib57484ce60d029f89c647fd5baf2c7af37c85d0b Signed-off-by: Harry Huang --- .../roles/setup-odl-sfc/tasks/control-agents-3.yml | 69 ++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100755 plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml (limited to 'plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml') diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml new file mode 100755 index 00000000..2527852e --- /dev/null +++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml @@ -0,0 +1,69 @@ +--- + +- name: configure opendaylight -> ml2 + shell: | + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 mechanism_drivers opendaylight_v2; + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 tenant_network_types vxlan; + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs enable_tunneling "True"; + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 extension_drivers port_security; + +- name: configure bridge_mappings -> ml2 + shell: | + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \ + ovs bridge_mappings "{{ contr_l2_mappings }}"; + when: + - odl_l3_agent == "Disable" + - inventory_hostname not in groups['nova_compute'] + +- name: configure bridge_mappings -> ml2 + shell: | + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \ + ovs bridge_mappings "{{ compu_l2_mappings }}"; + when: + - odl_l3_agent == "Disable" + - inventory_hostname in groups['nova_compute'] + +- name: configure bridge_mappings for L3 + shell: | + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \ + ovs bridge_mappings "{{ contr_l3_mappings }}"; + when: + - odl_l3_agent == "Enable" + - inventory_hostname not in groups['nova_compute'] + +- name: configure bridge_mappings for L3 + shell: | + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \ + ovs bridge_mappings "{{ compu_l3_mappings }}"; + when: + - odl_l3_agent == "Enable" + - inventory_hostname in groups['nova_compute'] + +- name: configure external bridge name for L2 + shell: | + crudini --set /etc/neutron/l3_agent.ini \ + DEFAULT external_network_bridge "{{ public_bridge }}"; + when: odl_l3_agent == "Disable" + +- name: configure opendaylight in ml2 + shell: | + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2_odl username admin; + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2_odl password admin; + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2_odl url \ + http://{{ internal_lb_vip_address }}:8080/controller/nb/v2/neutron; + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2_odl port_binding_controller \ + pseudo-agentdb-binding; + +- name: configure metadata for l3 configuration + shell: | + crudini --set /etc/neutron/dhcp_agent.ini DEFAULT \ + enable_isolated_metadata "True"; + when: + - inventory_hostname not in groups['nova_compute'] + +- name: force metadata for l3 configuration + shell: | + crudini --set /etc/neutron/dhcp_agent.ini DEFAULT \ + force_metadata "True"; + when: + - inventory_hostname not in groups['nova_compute'] -- cgit 1.2.3-korg