diff options
| -rwxr-xr-x | build/make_repo.sh | 12 | ||||
| -rw-r--r-- | build/templates/Debian_xenial_mitaka.tmpl | 71 | ||||
| -rw-r--r-- | deploy/conf/hardware_environment/huawei-pod1/network_onos.yml | 90 | ||||
| -rw-r--r-- | deploy/conf/hardware_environment/huawei-pod2/network_onos.yml | 90 | ||||
| -rw-r--r-- | deploy/conf/hardware_environment/intel-pod8/network_onos.yml | 90 | ||||
| -rw-r--r-- | deploy/conf/network_cfg_onos.yaml | 90 | ||||
| -rw-r--r-- | deploy/conf/vm_environment/huawei-virtual1/network_onos.yml | 90 | ||||
| -rw-r--r-- | deploy/conf/vm_environment/huawei-virtual2/network_onos.yml | 90 | ||||
| -rw-r--r-- | deploy/conf/vm_environment/huawei-virtual3/network_onos.yml | 90 | ||||
| -rw-r--r-- | deploy/conf/vm_environment/huawei-virtual4/network_onos.yml | 90 |
10 files changed, 801 insertions, 2 deletions
diff --git a/build/make_repo.sh b/build/make_repo.sh index 55ffbf1c..d784a627 100755 --- a/build/make_repo.sh +++ b/build/make_repo.sh @@ -86,7 +86,7 @@ function make_repo() exit 1 fi - if [[ ${os_ver} == trusty ]]; then + if [[ ${os_ver} == trusty || ${os_ver} == xenial ]]; then arch=Debian os_name=ubuntu fi @@ -106,7 +106,11 @@ function make_repo() docker_tag="${os_ver}/${package_tag}" if [[ -z ${tmpl} ]]; then - tmpl=${BUILD_PATH}/templates/${arch}_${package_tag}.tmpl + if [[ ${os_ver} == xenial ]]; then + tmpl=${BUILD_PATH}/templates/${arch}_${os_ver}_${package_tag}.tmpl + else + tmpl=${BUILD_PATH}/templates/${arch}_${package_tag}.tmpl + fi fi if [[ "${ansible_dir}" != "" ]]; then @@ -276,6 +280,10 @@ function make_all_repo() --default-package "openssh-server" \ --special-package "openvswitch-switch" done + + make_repo --os-ver xenial --package-tag mitaka \ + --ansible-dir $WORK_PATH/deploy/adapters/ansible \ + --default-package "openssh-server" make_repo --os-ver rhel7 --package-tag juno \ --ansible-dir $WORK_PATH/deploy/adapters/ansible \ diff --git a/build/templates/Debian_xenial_mitaka.tmpl b/build/templates/Debian_xenial_mitaka.tmpl new file mode 100644 index 00000000..f82da632 --- /dev/null +++ b/build/templates/Debian_xenial_mitaka.tmpl @@ -0,0 +1,71 @@ +#!/bin/bash +set -ex + +#set OPV="mitaka" + +# add openstack $OPV repo +apt-get update && apt-get install -y software-properties-common +# sudo add-apt-repository -y cloud-archive:$OPV +apt-get install -d nova-compute-kvm -y + +#make pernoca database +apt-get install -y apt-transport-https debconf-utils libaio1 libc6 libdbd-mysql-perl libgcc1 libgcrypt20 libstdc++6 python-software-properties wget +apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 +add-apt-repository 'deb https://mirrors.tuna.tsinghua.edu.cn/mariadb/mariadb-10.0.26/repo/ubuntu/ xenial main' +apt-get update +apt-get install -d mariadb-client mariadb-galera-server-10.0 galera-3 rsync socat -y +#make pernoca database end + + + +# add galeracluster repo +#sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db +#sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu trusty main' +#apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 D669017EBC19DDBA +##sudo add-apt-repository 'deb http://releases.galeracluster.com/ubuntu trusty main' +# add oracle java8 ppa +add-apt-repository ppa:webupd8team/java +# add open java7 repo +##sudo add-apt-repository 'deb http://security.ubuntu.com/ubuntu trusty-security main' + +apt-get update + +apt-get install python2.7 -y + +apt-get install reprepro -y + +apt-get -d install pciutils -y + +cd /var/cache/apt/ +apt-get download libexpat1 +cd - + +#download packages +#set packages = $getVar('default_packages', []) +#for pkg in $packages +apt-get -d install $pkg -y +#end for +#set packages = $getVar('packages', []) +#for pkg in $packages +apt-get -d install $pkg -y +#end for + +#make repo +mkdir -p xenial-$OPV-ppa/conf +cat <<EOF > xenial-$OPV-ppa/conf/distributions +Codename: xenial +Components: main +Architectures: amd64 +EOF + +apt-get install wget + +wget -O /var/cache/apt/python-pyasn1_0.1.8-2_all.deb http://us.archive.ubuntu.com/ubuntu/pool/main/p/pyasn1/python-pyasn1_0.1.8-2_all.deb +rm -rf /var/cache/apt/python-pyasn1_0.1.7-1ubuntu2_all.deb + +mkdir deb +find /var/cache/apt/ -name *.deb | xargs -i cp {} deb + +reprepro -b xenial-$OPV-ppa includedeb xenial deb/*.deb + +tar -zcvf /xenial-$OPV-ppa.tar.gz ./xenial-$OPV-ppa diff --git a/deploy/conf/hardware_environment/huawei-pod1/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod1/network_onos.yml new file mode 100644 index 00000000..1353ed40 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod1/network_onos.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.10.10" + - "192.168.10.50" + cidr: "192.168.10.0/24" + gw: "192.168.10.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.10.51 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: True + network: ext-net + type: vxlan + segment_id: 10 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "192.168.10.1" + floating_ip_cidr: "192.168.10.0/24" + floating_ip_start: "192.168.10.100" + floating_ip_end: "192.168.10.200" diff --git a/deploy/conf/hardware_environment/huawei-pod2/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod2/network_onos.yml new file mode 100644 index 00000000..7f128774 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod2/network_onos.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.11.10" + - "192.168.11.15" + cidr: "192.168.11.0/24" + gw: "192.168.11.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.11.18 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: True + network: ext-net + type: vxlan + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "192.168.11.1" + floating_ip_cidr: "192.168.11.0/24" + floating_ip_start: "192.168.11.30" + floating_ip_end: "192.168.11.100" diff --git a/deploy/conf/hardware_environment/intel-pod8/network_onos.yml b/deploy/conf/hardware_environment/intel-pod8/network_onos.yml new file mode 100644 index 00000000..cbe853d2 --- /dev/null +++ b/deploy/conf/hardware_environment/intel-pod8/network_onos.yml @@ -0,0 +1,90 @@ +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth3 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth2 + vlan_tag: 804 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth2 + vlan_tag: 802 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + vlan_tag: 805 + type: vlan + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "10.8.14.10" + - "10.8.14.30" + cidr: "10.8.14.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "10.8.12.10" + - "10.8.12.30" + cidr: "10.8.12.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "10.8.15.10" + - "10.8.15.30" + cidr: "10.8.15.0/24" + role: + - controller + - compute + +internal_vip: + ip: 10.8.14.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 10.8.15.222 + netmask: "24" + interface: external + +onos_nic: eth4 +public_net_info: + enable: True + network: ext-net + type: vxlan + segment_id: 10 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "10.8.15.1" + floating_ip_cidr: "10.8.15.0/24" + floating_ip_start: "10.8.15.100" + floating_ip_end: "10.8.15.200" diff --git a/deploy/conf/network_cfg_onos.yaml b/deploy/conf/network_cfg_onos.yaml new file mode 100644 index 00000000..3f12194e --- /dev/null +++ b/deploy/conf/network_cfg_onos.yaml @@ -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.50.210" + - "192.168.50.220" + cidr: "192.168.50.0/24" + gw: "192.168.50.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.50.240 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: True + network: ext-net + type: vxlan + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "192.168.50.1" + floating_ip_cidr: "192.168.50.0/24" + floating_ip_start: "192.168.50.221" + floating_ip_end: "192.168.50.231" diff --git a/deploy/conf/vm_environment/huawei-virtual1/network_onos.yml b/deploy/conf/vm_environment/huawei-virtual1/network_onos.yml new file mode 100644 index 00000000..0c9a9cb9 --- /dev/null +++ b/deploy/conf/vm_environment/huawei-virtual1/network_onos.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.107.210" + - "192.168.107.220" + cidr: "192.168.107.0/24" + gw: "192.168.107.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.107.222 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: True + network: ext-net + type: vxlan + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "192.168.107.1" + floating_ip_cidr: "192.168.107.0/24" + floating_ip_start: "192.168.107.101" + floating_ip_end: "192.168.107.199" diff --git a/deploy/conf/vm_environment/huawei-virtual2/network_onos.yml b/deploy/conf/vm_environment/huawei-virtual2/network_onos.yml new file mode 100644 index 00000000..bfd9ac1b --- /dev/null +++ b/deploy/conf/vm_environment/huawei-virtual2/network_onos.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.106.210" + - "192.168.106.220" + cidr: "192.168.106.0/24" + gw: "192.168.106.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.106.222 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: True + network: ext-net + type: vxlan + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "192.168.106.1" + floating_ip_cidr: "192.168.106.0/24" + floating_ip_start: "192.168.106.101" + floating_ip_end: "192.168.106.199" diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml b/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml new file mode 100644 index 00000000..35fb797d --- /dev/null +++ b/deploy/conf/vm_environment/huawei-virtual3/network_onos.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: vxlan + 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-virtual4/network_onos.yml b/deploy/conf/vm_environment/huawei-virtual4/network_onos.yml new file mode 100644 index 00000000..73e6fe47 --- /dev/null +++ b/deploy/conf/vm_environment/huawei-virtual4/network_onos.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: vxlan + 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" |