diff options
Diffstat (limited to 'deploy')
3 files changed, 189 insertions, 15 deletions
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml index 565e12e4..69c9d83d 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml @@ -83,11 +83,6 @@ # notify: # - restart odl service -- name: create jetty config - template: - src: jetty.xml - dest: "{{ odl_home }}/etc/jetty.xml" - - name: install odl pip packages pip: name={{ item }} state=present with_items: odl_pip @@ -150,14 +145,6 @@ #- name: copy Jolokia-OSGi jar config # copy: src=roles/odl_cluster/templates/jolokia-osgi-1.1.5.jar dest="{{ odl_home }}/system/org/jolokia/jolokia-osgi/1.1.5/" -- name: create odl haproxy config file - template: - src: haproxy-odl.cfg - dest: "/opt/haproxy-odl.cfg" - -- name: add odl haproxy configuration to haproxy.cfg - shell: "cat /opt/haproxy-odl.cfg >> /etc/haproxy/haproxy.cfg" - - name: remove karaf data directory shell: rm -rf {{ odl_home }}/data/*; @@ -202,6 +189,15 @@ - name: run openvswitch script include: openvswitch.yml +- name: add patch-port and normal flow table + shell: ovs-vsctl add-port br-int patch-br-prv; + ovs-vsctl set Interface patch-br-prv type=patch; + ovs-vsctl set Interface patch-br-prv options:peer=patch-int; + ovs-vsctl add-port br-prv patch-int; + ovs-vsctl set Interface patch-int type=patch; + ovs-vsctl set Interface patch-int options:peer=patch-br-prv; + ovs-ofctl -O OpenFlow13 add-flow br-int "table=0, priority=0 actions=NORMAL"; + ignore_errors: True #- name: Configure Neutron1 # shell: > @@ -241,5 +237,3 @@ - name: restart neutron-metadata-agent server service: name=neutron-metadata-agent state=restarted -- name: restart haproxy server - service: name=haproxy state=restarted diff --git a/deploy/conf/vm_environment/huawei-us-deploy-vm-3/network.yml b/deploy/conf/vm_environment/huawei-us-deploy-vm-3/network.yml new file mode 100644 index 00000000..9cb6f201 --- /dev/null +++ b/deploy/conf/vm_environment/huawei-us-deploy-vm-3/network.yml @@ -0,0 +1,90 @@ +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 101 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 102 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "192.168.101.210" + - "192.168.101.220" + cidr: "192.168.101.0/24" + gw: "192.168.101.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.101.222 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: True + network: ext-net + type: flat + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "192.168.101.1" + floating_ip_cidr: "192.168.101.0/24" + floating_ip_start: "192.168.101.101" + floating_ip_end: "192.168.101.199" diff --git a/deploy/conf/vm_environment/huawei-us-deploy-vm-4/network.yml b/deploy/conf/vm_environment/huawei-us-deploy-vm-4/network.yml new file mode 100644 index 00000000..d7876891 --- /dev/null +++ b/deploy/conf/vm_environment/huawei-us-deploy-vm-4/network.yml @@ -0,0 +1,90 @@ +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 101 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 102 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "192.168.103.210" + - "192.168.103.220" + cidr: "192.168.103.0/24" + gw: "192.168.103.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.103.222 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: True + network: ext-net + type: flat + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "192.168.103.1" + floating_ip_cidr: "192.168.103.0/24" + floating_ip_start: "192.168.103.101" + floating_ip_end: "192.168.103.199" |