diff options
8 files changed, 345 insertions, 12 deletions
diff --git a/deploy/adapters/ansible/roles/onos_cluster/files/driver.sh b/deploy/adapters/ansible/roles/onos_cluster/files/driver.sh new file mode 100755 index 00000000..97706dbe --- /dev/null +++ b/deploy/adapters/ansible/roles/onos_cluster/files/driver.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +sed -i '/\[networking_sfc.sfc.drivers\]/a onos = networking_onos.services.sfc.driver:OnosSfcDriver' /usr/local/lib/python2.7/dist-packages/networking_sfc-3.0.0.dist-info/entry_points.txt + +sed -i '/\[networking_sfc.flowclassifier.drivers\]/a onos = networking_onos.services.flowclassifier.driver:OnosFlowClassifierDriver' /usr/local/lib/python2.7/dist-packages/networking_sfc-3.0.0.dist-info/entry_points.txt diff --git a/deploy/adapters/ansible/roles/onos_cluster/files/sfc_plugins.conf b/deploy/adapters/ansible/roles/onos_cluster/files/sfc_plugins.conf index ddef928d..a5049f61 100644..100755 --- a/deploy/adapters/ansible/roles/onos_cluster/files/sfc_plugins.conf +++ b/deploy/adapters/ansible/roles/onos_cluster/files/sfc_plugins.conf @@ -2,3 +2,9 @@ service_plugins = networking_sfc.services.sfc.plugin.SfcPlugin,networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,onos_router +[sfc] +drivers = onos + +[flowclassifier] +drivers = onos + diff --git a/deploy/adapters/ansible/roles/onos_cluster/tasks/onos_sfc_controller.yml b/deploy/adapters/ansible/roles/onos_cluster/tasks/onos_sfc_controller.yml index 2874d503..136e8da5 100755 --- a/deploy/adapters/ansible/roles/onos_cluster/tasks/onos_sfc_controller.yml +++ b/deploy/adapters/ansible/roles/onos_cluster/tasks/onos_sfc_controller.yml @@ -17,13 +17,11 @@ url: "http://{{ http_server.stdout_lines[0] }}/packages/onos/{{ onos_driver }}" dest: /opt/ -- name: download onos sfc driver package - get_url: - url: "http://{{ http_server.stdout_lines[0] }}/packages/onos/{{ onos_sfc_driver }}" - dest: /opt/ - - name: unarchive onos driver package - command: su -s /bin/sh -c "tar xvf /opt/networking-onos.tar -C /opt/" + command: su -s /bin/sh -c "tar zxf /opt/networking-onos.tar.gz -C /opt/" + +- name: upgrade stevedore + pip: name=stevedore state=latest - name: install onos driver command: su -s /bin/sh -c "/opt/networking-onos/install_driver.sh" @@ -31,6 +29,15 @@ - name: install networking-sfc pip: name=networking-sfc state=present version=3.0.0 +- name: copy driver_configuration script + copy: + src: driver.sh + dest: "/opt/driver.sh" + mode: 0777 + +- name: Configure sfc driver + command: su -s /bin/sh -c "/opt/driver.sh;" + - name: install onos required packages action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" with_items: "{{ packages }}" @@ -181,11 +188,12 @@ - name: Configure Neutron3 shell: > - mysql -e "drop database if exists neutron_ml2;"; - mysql -e "create database neutron_ml2 character set utf8;"; - mysql -e "grant all on neutron_ml2.* to 'neutron'@'%';"; + mysql -e "drop database if exists neutron;"; + mysql -e "create database neutron character set utf8;"; + mysql -e "grant all on neutron.* to 'neutron'@'%' identified by \ + '{{ NEUTRON_DBPASS }}';"; su -s /bin/sh -c "neutron-db-manage --config-file /etc/neutron/neutron.conf \ - --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head" neutron; + --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head" neutron; su -s /bin/sh -c "neutron-db-manage --subproject networking-sfc upgrade head" neutron; when: inventory_hostname == haproxy_hosts.keys()[0] diff --git a/deploy/adapters/ansible/roles/onos_cluster/vars/main.yml b/deploy/adapters/ansible/roles/onos_cluster/vars/main.yml index 3c3dd557..e140446f 100755 --- a/deploy/adapters/ansible/roles/onos_cluster/vars/main.yml +++ b/deploy/adapters/ansible/roles/onos_cluster/vars/main.yml @@ -13,8 +13,8 @@ onos_home: /opt/onos/ karaf_dist: apache-karaf-3.0.5 jdk8_pkg_name: jdk-8u51-linux-x64.tar.gz jdk8_script_name: install_jdk8.tar -onos_driver: networking-onos.tar -onos_sfc_driver: networking-sfc.tar +onos_driver: networking-onos.tar.gz +onos_sfc_driver: networking-sfc.tar.gz repository: repository.tar sfc_plugins: src: sfc_plugins.conf diff --git a/deploy/conf/hardware_environment/huawei-pod7/network.yml b/deploy/conf/hardware_environment/huawei-pod7/network.yml new file mode 100644 index 00000000..e255c695 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod7/network.yml @@ -0,0 +1,100 @@ +############################################################################## +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- +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: 2001 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 2002 + 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.20.10" + - "192.168.20.50" + cidr: "192.168.20.0/24" + gw: "192.168.20.250" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.20.222 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: "True" + network: ext-net + type: flat + segment_id: 10 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: "False" + no_gateway: "False" + external_gw: "192.168.20.250" + floating_ip_cidr: "192.168.20.0/24" + floating_ip_start: "192.168.20.100" + floating_ip_end: "192.168.20.200" diff --git a/deploy/conf/hardware_environment/huawei-pod7/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod7/os-nosdn-nofeature-ha.yml new file mode 100644 index 00000000..71cac58a --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod7/os-nosdn-nofeature-ha.yml @@ -0,0 +1,65 @@ +############################################################################## +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: '88:cf:98:61:66:77' + interfaces: + - eth1: '88:CF:98:61:66:76' + ipmiIp: 192.168.120.12 + ipmiPass: Opnfv@pod7 + roles: + - controller + - ha + + - name: host2 + mac: '88:cf:98:61:66:c9' + interfaces: + - eth1: '88:CF:98:61:66:C8' + ipmiIp: 192.168.120.13 + ipmiPass: Opnfv@pod7 + roles: + - controller + - ha + + - name: host3 + mac: '88:cf:98:83:31:98' + interfaces: + - eth1: '88:CF:98:83:31:97' + ipmiIp: 192.168.120.14 + ipmiPass: Opnfv@pod7 + roles: + - controller + - ha + + - name: host4 + mac: '88:cf:98:61:67:09' + interfaces: + - eth1: '88:CF:98:61:67:08' + ipmiIp: 192.168.120.15 + ipmiPass: Opnfv@pod7 + roles: + - compute + + - name: host5 + mac: '88:cf:98:83:31:e4' + interfaces: + - eth1: '88:CF:98:83:31:E3' + ipmiIp: 192.168.120.16 + ipmiPass: Opnfv@pod7 + roles: + - compute diff --git a/deploy/conf/hardware_environment/huawei-pod7/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod7/os-odl_l2-nofeature-ha.yml new file mode 100644 index 00000000..d117d2f5 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod7/os-odl_l2-nofeature-ha.yml @@ -0,0 +1,74 @@ +############################################################################## +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: '88:cf:98:61:66:77' + interfaces: + - eth1: '88:CF:98:61:66:76' + ipmiIp: 192.168.120.12 + ipmiPass: Opnfv@pod7 + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: host2 + mac: '88:cf:98:61:66:c9' + interfaces: + - eth1: '88:CF:98:61:66:C8' + ipmiIp: 192.168.120.13 + ipmiPass: Opnfv@pod7 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host3 + mac: '88:cf:98:83:31:98' + interfaces: + - eth1: '88:CF:98:83:31:97' + ipmiIp: 192.168.120.14 + ipmiPass: Opnfv@pod7 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host4 + mac: '88:cf:98:61:67:09' + interfaces: + - eth1: '88:CF:98:61:67:08' + ipmiIp: 192.168.120.15 + ipmiPass: Opnfv@pod7 + roles: + - compute + - ceph-osd + + - name: host5 + mac: '88:cf:98:83:31:e4' + interfaces: + - eth1: '88:CF:98:83:31:E3' + ipmiIp: 192.168.120.16 + ipmiPass: Opnfv@pod7 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod7/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod7/os-odl_l3-nofeature-ha.yml new file mode 100644 index 00000000..987a7739 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod7/os-odl_l3-nofeature-ha.yml @@ -0,0 +1,75 @@ +############################################################################## +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +odl_l3_agent: "Enable" +hosts: + - name: host1 + mac: '88:cf:98:61:66:77' + interfaces: + - eth1: '88:CF:98:61:66:76' + ipmiIp: 192.168.120.12 + ipmiPass: Opnfv@pod7 + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: host2 + mac: '88:cf:98:61:66:c9' + interfaces: + - eth1: '88:CF:98:61:66:C8' + ipmiIp: 192.168.120.13 + ipmiPass: Opnfv@pod7 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host3 + mac: '88:cf:98:83:31:98' + interfaces: + - eth1: '88:CF:98:83:31:97' + ipmiIp: 192.168.120.14 + ipmiPass: Opnfv@pod7 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host4 + mac: '88:cf:98:61:67:09' + interfaces: + - eth1: '88:CF:98:61:67:08' + ipmiIp: 192.168.120.15 + ipmiPass: Opnfv@pod7 + roles: + - compute + - ceph-osd + + - name: host5 + mac: '88:cf:98:83:31:e4' + interfaces: + - eth1: '88:CF:98:83:31:E3' + ipmiIp: 192.168.120.16 + ipmiPass: Opnfv@pod7 + roles: + - compute + - ceph-osd |