diff options
Diffstat (limited to 'deploy')
11 files changed, 735 insertions, 8 deletions
diff --git a/deploy/conf/hardware_environment/huawei-pod4/network.yml b/deploy/conf/hardware_environment/huawei-pod4/network.yml new file mode 100644 index 00000000..ff1038bd --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod4/network.yml @@ -0,0 +1,91 @@ +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.23.10" + - "192.168.23.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.23.51 + 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.23.1" + floating_ip_cidr: "192.168.23.0/24" + floating_ip_start: "192.168.23.100" + floating_ip_end: "192.168.23.200" + diff --git a/deploy/conf/hardware_environment/huawei-pod4/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod4/network_ocl.yml new file mode 100644 index 00000000..5a5e9967 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod4/network_ocl.yml @@ -0,0 +1,91 @@ +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.23.10" + - "192.168.23.50" + cidr: "192.168.23.0/24" + gw: "192.168.23.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.23.51 + 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: "100.100.100.1" + floating_ip_cidr: "100.100.100.0/24" + floating_ip_start: "100.100.100.30" + floating_ip_end: "100.100.100.120" + diff --git a/deploy/conf/hardware_environment/huawei-pod4/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod4/network_onos.yml new file mode 100644 index 00000000..76cfd028 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod4/network_onos.yml @@ -0,0 +1,91 @@ +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.23.10" + - "192.168.23.50" + cidr: "192.168.23.0/24" + gw: "192.168.23.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.23.51 + 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.23.1" + floating_ip_cidr: "192.168.23.0/24" + floating_ip_start: "192.168.23.100" + floating_ip_end: "192.168.23.200" + diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-nosdn-nofeature-ha.yml new file mode 100644 index 00000000..771b7c4a --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod4/os-nosdn-nofeature-ha.yml @@ -0,0 +1,62 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: 'E8:4D:D0:BA:63:49' + interfaces: + - eth1: 'E8:4D:D0:BA:63:4A' + ipmiIp: 172.16.131.17 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - ceph-adm + - ceph-mon + + - name: host2 + mac: 'E8:4D:D0:BB:AA:C5' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:C6' + ipmiIp: 172.16.131.18 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - ceph-mon + + - name: host3 + mac: 'E8:4D:D0:B9:1F:49' + interfaces: + - eth1: 'E8:4D:D0:B9:1F:4A' + ipmiIp: 172.16.131.19 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - ceph-mon + + - name: host4 + mac: 'E8:4D:D0:BB:AA:E9' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:EA' + ipmiIp: 172.16.131.20 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd + + - name: host5 + mac: 'E8:4D:D0:BB:AB:1D' + interfaces: + - eth1: 'E8:4D:D0:BB:AB:1E' + ipmiIp: 172.16.131.21 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-ocl-nofeature-ha.yml new file mode 100644 index 00000000..f4e36f87 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod4/os-ocl-nofeature-ha.yml @@ -0,0 +1,61 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: 'E8:4D:D0:BA:63:49' + interfaces: + - eth1: 'E8:4D:D0:BA:63:4A' + ipmiIp: 172.16.131.17 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - opencontrail + - ceph-adm + - ceph-mon + + - name: host2 + mac: 'E8:4D:D0:BB:AA:C5' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:C6' + ipmiIp: 172.16.131.18 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd + + - name: host3 + mac: 'E8:4D:D0:B9:1F:49' + interfaces: + - eth1: 'E8:4D:D0:B9:1F:4A' + ipmiIp: 172.16.131.19 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd + + - name: host4 + mac: 'E8:4D:D0:BB:AA:E9' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:EA' + ipmiIp: 172.16.131.20 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd + + - name: host5 + mac: 'E8:4D:D0:BB:AB:1D' + interfaces: + - eth1: 'E8:4D:D0:BB:AB:1E' + ipmiIp: 172.16.131.21 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-moon-ha.yml new file mode 100644 index 00000000..5c41dc31 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-moon-ha.yml @@ -0,0 +1,67 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +moon: "Enable" + +hosts: + - name: host1 + mac: 'E8:4D:D0:BA:63:49' + interfaces: + - eth1: 'E8:4D:D0:BA:63:4A' + ipmiIp: 172.16.131.17 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: host2 + mac: 'E8:4D:D0:BB:AA:C5' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:C6' + ipmiIp: 172.16.131.18 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host3 + mac: 'E8:4D:D0:B9:1F:49' + interfaces: + - eth1: 'E8:4D:D0:B9:1F:4A' + ipmiIp: 172.16.131.19 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host4 + mac: 'E8:4D:D0:BB:AA:E9' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:EA' + ipmiIp: 172.16.131.20 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd + + - name: host5 + mac: 'E8:4D:D0:BB:AB:1D' + interfaces: + - eth1: 'E8:4D:D0:BB:AB:1E' + ipmiIp: 172.16.131.21 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-nofeature-ha.yml new file mode 100644 index 00000000..c4d04692 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-nofeature-ha.yml @@ -0,0 +1,65 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: 'E8:4D:D0:BA:63:49' + interfaces: + - eth1: 'E8:4D:D0:BA:63:4A' + ipmiIp: 172.16.131.17 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: host2 + mac: 'E8:4D:D0:BB:AA:C5' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:C6' + ipmiIp: 172.16.131.18 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host3 + mac: 'E8:4D:D0:B9:1F:49' + interfaces: + - eth1: 'E8:4D:D0:B9:1F:4A' + ipmiIp: 172.16.131.19 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host4 + mac: 'E8:4D:D0:BB:AA:E9' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:EA' + ipmiIp: 172.16.131.20 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd + + - name: host5 + mac: 'E8:4D:D0:BB:AB:1D' + interfaces: + - eth1: 'E8:4D:D0:BB:AB:1E' + ipmiIp: 172.16.131.21 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l3-nofeature-ha.yml new file mode 100644 index 00000000..b77313af --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l3-nofeature-ha.yml @@ -0,0 +1,67 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +odl_l3_agent: "Enable" + +hosts: + - name: host1 + mac: 'E8:4D:D0:BA:63:49' + interfaces: + - eth1: 'E8:4D:D0:BA:63:4A' + ipmiIp: 172.16.131.17 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: host2 + mac: 'E8:4D:D0:BB:AA:C5' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:C6' + ipmiIp: 172.16.131.18 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host3 + mac: 'E8:4D:D0:B9:1F:49' + interfaces: + - eth1: 'E8:4D:D0:B9:1F:4A' + ipmiIp: 172.16.131.19 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host4 + mac: 'E8:4D:D0:BB:AA:E9' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:EA' + ipmiIp: 172.16.131.20 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd + + - name: host5 + mac: 'E8:4D:D0:BB:AB:1D' + interfaces: + - eth1: 'E8:4D:D0:BB:AB:1E' + ipmiIp: 172.16.131.21 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-onos-nofeature-ha.yml new file mode 100644 index 00000000..5c27976b --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod4/os-onos-nofeature-ha.yml @@ -0,0 +1,65 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: 'E8:4D:D0:BA:63:49' + interfaces: + - eth1: 'E8:4D:D0:BA:63:4A' + ipmiIp: 172.16.131.17 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - onos + - ceph-adm + - ceph-mon + + - name: host2 + mac: 'E8:4D:D0:BB:AA:C5' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:C6' + ipmiIp: 172.16.131.18 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - onos + - ceph-mon + + - name: host3 + mac: 'E8:4D:D0:B9:1F:49' + interfaces: + - eth1: 'E8:4D:D0:B9:1F:4A' + ipmiIp: 172.16.131.19 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - onos + - ceph-mon + + - name: host4 + mac: 'E8:4D:D0:BB:AA:E9' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:EA' + ipmiIp: 172.16.131.20 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd + + - name: host5 + mac: 'E8:4D:D0:BB:AB:1D' + interfaces: + - eth1: 'E8:4D:D0:BB:AB:1E' + ipmiIp: 172.16.131.21 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-onos-sfc-ha.yml new file mode 100644 index 00000000..5c27976b --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod4/os-onos-sfc-ha.yml @@ -0,0 +1,65 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: 'E8:4D:D0:BA:63:49' + interfaces: + - eth1: 'E8:4D:D0:BA:63:4A' + ipmiIp: 172.16.131.17 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - onos + - ceph-adm + - ceph-mon + + - name: host2 + mac: 'E8:4D:D0:BB:AA:C5' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:C6' + ipmiIp: 172.16.131.18 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - onos + - ceph-mon + + - name: host3 + mac: 'E8:4D:D0:B9:1F:49' + interfaces: + - eth1: 'E8:4D:D0:B9:1F:4A' + ipmiIp: 172.16.131.19 + ipmiPass: Huawei@123 + roles: + - controller + - ha + - onos + - ceph-mon + + - name: host4 + mac: 'E8:4D:D0:BB:AA:E9' + interfaces: + - eth1: 'E8:4D:D0:BB:AA:EA' + ipmiIp: 172.16.131.20 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd + + - name: host5 + mac: 'E8:4D:D0:BB:AB:1D' + interfaces: + - eth1: 'E8:4D:D0:BB:AB:1E' + ipmiIp: 172.16.131.21 + ipmiPass: Huawei@123 + roles: + - compute + - ceph-osd diff --git a/deploy/prepare.sh b/deploy/prepare.sh index a4f606af..22183f49 100755 --- a/deploy/prepare.sh +++ b/deploy/prepare.sh @@ -36,13 +36,6 @@ function download_iso() } function prepare_env() { - if [[ "$DEPLOY_FIRST_TIME" == "true" ]]; then - sudo apt-get update -y - sudo apt-get install -y --force-yes mkisofs bc curl ipmitool openvswitch-switch - sudo apt-get install -y --force-yes git python-dev - sudo apt-get install -y --force-yes libxslt-dev libxml2-dev libvirt-dev build-essential qemu-utils qemu-kvm libvirt-bin virtinst libmysqld-dev - sudo apt-get install -y --force-yes libffi-dev libssl-dev - fi sudo service libvirt-bin restart if sudo service openvswitch-switch status|grep stop; then @@ -78,11 +71,20 @@ function _prepare_python_env() { rm -rf $WORK_DIR/venv mkdir -p $WORK_DIR/venv - sudo apt-get install -y --force-yes python-pip + if [[ "$DEPLOY_FIRST_TIME" == "true" ]]; then + sudo apt-get update -y + sudo apt-get install -y --force-yes mkisofs bc curl ipmitool openvswitch-switch + sudo apt-get install -y --force-yes git python-dev python-pip + sudo apt-get install -y --force-yes libxslt-dev libxml2-dev libvirt-dev build-essential qemu-utils qemu-kvm libvirt-bin virtinst libmysqld-dev + sudo apt-get install -y --force-yes libffi-dev libssl-dev + fi + sudo pip install --upgrade virtualenv virtualenv $WORK_DIR/venv source $WORK_DIR/venv/bin/activate + pip install --upgrade cffi + pip install --upgrade MarkupSafe pip install --upgrade pip pip install --upgrade cheetah pip install --upgrade pyyaml |