diff options
15 files changed, 80 insertions, 29 deletions
@@ -82,7 +82,7 @@ function download_packages() $TRUSTY_JUNO_PPA $TRUSTY_LIBERTY_PPA $TRUSTY_MITAKA_PPA $XENIAL_MITAKA_PPA $XENIAL_NEWTON_PPA \ $UBUNTU_ISO $UBUNTU_ISO1 $REDHAT7_ISO $REDHAT7_OSP9_PPA \ $CENTOS_ISO $CENTOS7_JUNO_PPA $CENTOS7_KILO_PPA $CENTOS7_LIBERTY_PPA $CENTOS7_MITAKA_PPA \ - $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG $PIP_REPO $PIP_OPS_REPO $ANSIBLE_MODULE; do + $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG $PIP_REPO $PIP_OPENSTACK_REPO $ANSIBLE_MODULE; do if [[ ! $i ]]; then continue @@ -105,7 +105,7 @@ function copy_file() new=$1 # main process - mkdir -p $new/compass $new/bootstrap $new/pip $new/pip-ops $new/guestimg $new/app_packages $new/ansible + mkdir -p $new/compass $new/bootstrap $new/pip $new/pip-openstack $new/guestimg $new/app_packages $new/ansible mkdir -p $new/repos/cobbler/{ubuntu,centos,redhat}/{iso,ppa} rm -rf $new/.rr_moved @@ -181,7 +181,7 @@ function copy_file() cp $COMPASS_DIR/deploy/adapters $new/compass/compass-adapters -rf tar -zxvf $CACHE_DIR/`basename $PIP_REPO` -C $new/ - tar -zxvf $CACHE_DIR/`basename $PIP_OPS_REPO` -C $new/ + tar -zxvf $CACHE_DIR/`basename $PIP_OPENSTACK_REPO` -C $new/ find $new/compass -name ".git" | xargs rm -rf } diff --git a/build/build.conf b/build/build.conf index 7b46ecf7..f9e40568 100644 --- a/build/build.conf +++ b/build/build.conf @@ -14,7 +14,7 @@ export COMPASS_INSTALL=${COMPASS_INSTALL:-http://github.com/baigk/compass-instal # Compass core packages export COMPASS_PKG=${COMPASS_PKG:-$PACKAGE_URL/centos7-compass-core.tar.gz} export PIP_REPO=${PIP_REPO:-$PACKAGE_URL/pip.tar.gz} -export PIP_OPS_REPO=${PIP_OPS_REPO:-$PACKAGE_URL/pip-ops.tar.gz} +export PIP_OPENSTACK_REPO=${PIP_OPENSTACK_REPO:-$PACKAGE_URL/pip-openstack.tar.gz} export ANSIBLE_MODULE=${ANSIBLE_MODULE:-https://github.com/openstack-ansible/openstack-ansible-modules.git} # OS ISO for provisioning diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_install.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_install.yml index e9a36d42..757349c5 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_install.yml +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_install.yml @@ -92,6 +92,7 @@ template: src={{ item }} dest=/opt/{{ item }} with_items: - admin-openrc.sh + - admin-openrc-v2.sh - demo-openrc.sh - meta: flush_handlers diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/templates/admin-openrc-v2.sh b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/templates/admin-openrc-v2.sh new file mode 100644 index 00000000..6ba620ff --- /dev/null +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/templates/admin-openrc-v2.sh @@ -0,0 +1,15 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## +# Verify the Identity Service installation +export OS_PASSWORD={{ ADMIN_PASS }} +export OS_TENANT_NAME=admin +export OS_AUTH_URL=http://{{ internal_vip.ip }}:35357/v2.0 +export OS_USERNAME=admin +export OS_VOLUME_API_VERSION=2 + diff --git a/deploy/conf/hardware_environment/intel-pod8/network.yml b/deploy/conf/hardware_environment/intel-pod8/network.yml index 659b8075..5107649d 100644 --- a/deploy/conf/hardware_environment/intel-pod8/network.yml +++ b/deploy/conf/hardware_environment/intel-pod8/network.yml @@ -4,7 +4,7 @@ bond_mappings: [] provider_net_mappings: - name: br-prv network: physnet - interface: eth3 + interface: eth1 type: ovs role: - controller @@ -12,8 +12,8 @@ provider_net_mappings: sys_intf_mappings: - name: mgmt - interface: eth2 - vlan_tag: 804 + interface: eth3 + vlan_tag: 854 type: vlan role: - controller @@ -21,7 +21,7 @@ sys_intf_mappings: - name: storage interface: eth2 - vlan_tag: 802 + vlan_tag: 804 type: vlan role: - controller @@ -29,8 +29,7 @@ sys_intf_mappings: - name: external interface: br-prv - vlan_tag: 805 - type: vlan + type: ovs role: - controller - compute @@ -59,6 +58,7 @@ ip_settings: - - "10.8.15.10" - "10.8.15.30" cidr: "10.8.15.0/24" + gw: "10.8.15.1" role: - controller - compute diff --git a/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml b/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml index 23a8da3d..5107649d 100644 --- a/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml +++ b/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml @@ -4,7 +4,7 @@ bond_mappings: [] provider_net_mappings: - name: br-prv network: physnet - interface: eth3 + interface: eth1 type: ovs role: - controller @@ -12,8 +12,8 @@ provider_net_mappings: sys_intf_mappings: - name: mgmt - interface: eth2 - vlan_tag: 804 + interface: eth3 + vlan_tag: 854 type: vlan role: - controller @@ -21,7 +21,7 @@ sys_intf_mappings: - name: storage interface: eth2 - vlan_tag: 802 + vlan_tag: 804 type: vlan role: - controller @@ -29,8 +29,7 @@ sys_intf_mappings: - name: external interface: br-prv - vlan_tag: 805 - type: vlan + type: ovs role: - controller - compute @@ -59,6 +58,7 @@ ip_settings: - - "10.8.15.10" - "10.8.15.30" cidr: "10.8.15.0/24" + gw: "10.8.15.1" role: - controller - compute @@ -84,7 +84,7 @@ public_net_info: 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" + 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/hardware_environment/intel-pod8/network_onos.yml b/deploy/conf/hardware_environment/intel-pod8/network_onos.yml index cbe853d2..c6adfd72 100644 --- a/deploy/conf/hardware_environment/intel-pod8/network_onos.yml +++ b/deploy/conf/hardware_environment/intel-pod8/network_onos.yml @@ -4,7 +4,7 @@ bond_mappings: [] provider_net_mappings: - name: br-prv network: physnet - interface: eth3 + interface: eth2 type: ovs role: - controller @@ -12,8 +12,8 @@ provider_net_mappings: sys_intf_mappings: - name: mgmt - interface: eth2 - vlan_tag: 804 + interface: eth3 + vlan_tag: 854 type: vlan role: - controller @@ -21,7 +21,7 @@ sys_intf_mappings: - name: storage interface: eth2 - vlan_tag: 802 + vlan_tag: 804 type: vlan role: - controller @@ -29,8 +29,7 @@ sys_intf_mappings: - name: external interface: br-prv - vlan_tag: 805 - type: vlan + type: ovs role: - controller - compute @@ -59,6 +58,7 @@ ip_settings: - - "10.8.15.10" - "10.8.15.30" cidr: "10.8.15.0/24" + gw: "10.8.15.1" role: - controller - compute @@ -73,11 +73,11 @@ public_vip: netmask: "24" interface: external -onos_nic: eth4 +onos_nic: eth1 public_net_info: enable: True network: ext-net - type: vxlan + type: flat segment_id: 10 subnet: ext-subnet provider_network: physnet diff --git a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml index f026b4f7..87c1e72b 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml @@ -11,6 +11,7 @@ hosts: - name: host1 mac: '00:1E:67:D4:30:D2' interfaces: + - eth1: '00:1E:67:D4:30:D1' - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' ipmiIp: 10.2.117.134 @@ -23,6 +24,7 @@ hosts: - name: host2 mac: '00:1E:67:D4:39:B5' interfaces: + - eth1: '00:1E:67:D4:39:B4' - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' ipmiIp: 10.2.117.136 @@ -34,6 +36,7 @@ hosts: - name: host3 mac: '00:1E:67:D4:31:B2' interfaces: + - eth1: '00:1E:67:D4:31:B1' - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' ipmiIp: 10.2.117.138 @@ -45,6 +48,7 @@ hosts: - name: host4 mac: '00:1E:67:D4:34:67' interfaces: + - eth1: '00:1E:67:D4:34:66' - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' ipmiIp: 10.2.117.140 @@ -55,6 +59,7 @@ hosts: - name: host5 mac: '00:1E:67:D4:38:42' interfaces: + - eth1: '00:1E:67:D4:38:41' - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' ipmiIp: 10.2.117.142 diff --git a/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml index b8d93d6b..a320174f 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml @@ -11,6 +11,7 @@ hosts: - name: host1 mac: '00:1E:67:D4:30:D2' interfaces: + - eth1: '00:1E:67:D4:30:D1' - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' ipmiIp: 10.2.117.134 @@ -24,6 +25,7 @@ hosts: - name: host2 mac: '00:1E:67:D4:39:B5' interfaces: + - eth1: '00:1E:67:D4:39:B4' - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' ipmiIp: 10.2.117.136 @@ -34,6 +36,7 @@ hosts: - name: host3 mac: '00:1E:67:D4:31:B2' interfaces: + - eth1: '00:1E:67:D4:31:B1' - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' ipmiIp: 10.2.117.138 @@ -44,6 +47,7 @@ hosts: - name: host4 mac: '00:1E:67:D4:34:67' interfaces: + - eth1: '00:1E:67:D4:34:66' - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' ipmiIp: 10.2.117.140 @@ -54,6 +58,7 @@ hosts: - name: host5 mac: '00:1E:67:D4:38:42' interfaces: + - eth1: '00:1E:67:D4:38:41' - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' ipmiIp: 10.2.117.142 diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml index 62075c05..dde9ebe1 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml @@ -13,6 +13,7 @@ hosts: - name: host1 mac: '00:1E:67:D4:30:D2' interfaces: + - eth1: '00:1E:67:D4:30:D1' - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' ipmiIp: 10.2.117.134 @@ -26,6 +27,7 @@ hosts: - name: host2 mac: '00:1E:67:D4:39:B5' interfaces: + - eth1: '00:1E:67:D4:39:B4' - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' ipmiIp: 10.2.117.136 @@ -38,6 +40,7 @@ hosts: - name: host3 mac: '00:1E:67:D4:31:B2' interfaces: + - eth1: '00:1E:67:D4:31:B1' - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' ipmiIp: 10.2.117.138 @@ -50,6 +53,7 @@ hosts: - name: host4 mac: '00:1E:67:D4:34:67' interfaces: + - eth1: '00:1E:67:D4:34:66' - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' ipmiIp: 10.2.117.140 @@ -60,6 +64,7 @@ hosts: - name: host5 mac: '00:1E:67:D4:38:42' interfaces: + - eth1: '00:1E:67:D4:38:41' - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' ipmiIp: 10.2.117.142 diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml index 39f946b3..59f353ec 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml @@ -11,6 +11,7 @@ hosts: - name: host1 mac: '00:1E:67:D4:30:D2' interfaces: + - eth1: '00:1E:67:D4:30:D1' - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' ipmiIp: 10.2.117.134 @@ -24,6 +25,7 @@ hosts: - name: host2 mac: '00:1E:67:D4:39:B5' interfaces: + - eth1: '00:1E:67:D4:39:B4' - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' ipmiIp: 10.2.117.136 @@ -36,6 +38,7 @@ hosts: - name: host3 mac: '00:1E:67:D4:31:B2' interfaces: + - eth1: '00:1E:67:D4:31:B1' - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' ipmiIp: 10.2.117.138 @@ -48,6 +51,7 @@ hosts: - name: host4 mac: '00:1E:67:D4:34:67' interfaces: + - eth1: '00:1E:67:D4:34:66' - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' ipmiIp: 10.2.117.140 @@ -58,6 +62,7 @@ hosts: - name: host5 mac: '00:1E:67:D4:38:42' interfaces: + - eth1: '00:1E:67:D4:38:41' - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' ipmiIp: 10.2.117.142 diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml index f4fadc94..7aa31ffb 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml @@ -13,6 +13,7 @@ hosts: - name: host1 mac: '00:1E:67:D4:30:D2' interfaces: + - eth1: '00:1E:67:D4:30:D1' - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' ipmiIp: 10.2.117.134 @@ -26,6 +27,7 @@ hosts: - name: host2 mac: '00:1E:67:D4:39:B5' interfaces: + - eth1: '00:1E:67:D4:39:B4' - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' ipmiIp: 10.2.117.136 @@ -38,6 +40,7 @@ hosts: - name: host3 mac: '00:1E:67:D4:31:B2' interfaces: + - eth1: '00:1E:67:D4:31:B1' - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' ipmiIp: 10.2.117.138 @@ -50,6 +53,7 @@ hosts: - name: host4 mac: '00:1E:67:D4:34:67' interfaces: + - eth1: '00:1E:67:D4:34:66' - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' ipmiIp: 10.2.117.140 @@ -60,6 +64,7 @@ hosts: - name: host5 mac: '00:1E:67:D4:38:42' interfaces: + - eth1: '00:1E:67:D4:38:41' - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' ipmiIp: 10.2.117.142 diff --git a/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml index 7606691e..a7b49f3d 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml @@ -11,6 +11,7 @@ hosts: - name: host1 mac: '00:1E:67:D4:30:D2' interfaces: + - eth1: '00:1E:67:D4:30:D1' - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' ipmiIp: 10.2.117.134 @@ -24,6 +25,7 @@ hosts: - name: host2 mac: '00:1E:67:D4:39:B5' interfaces: + - eth1: '00:1E:67:D4:39:B4' - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' ipmiIp: 10.2.117.136 @@ -36,6 +38,7 @@ hosts: - name: host3 mac: '00:1E:67:D4:31:B2' interfaces: + - eth1: '00:1E:67:D4:31:B1' - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' ipmiIp: 10.2.117.138 @@ -48,6 +51,7 @@ hosts: - name: host4 mac: '00:1E:67:D4:34:67' interfaces: + - eth1: '00:1E:67:D4:34:66' - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' ipmiIp: 10.2.117.140 @@ -58,6 +62,7 @@ hosts: - name: host5 mac: '00:1E:67:D4:38:42' interfaces: + - eth1: '00:1E:67:D4:38:41' - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' ipmiIp: 10.2.117.142 diff --git a/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml index 11bfd223..da8c1cd3 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml @@ -13,6 +13,7 @@ hosts: - name: host1 mac: '00:1E:67:D4:30:D2' interfaces: + - eth1: '00:1E:67:D4:30:D1' - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' ipmiIp: 10.2.117.134 @@ -26,6 +27,7 @@ hosts: - name: host2 mac: '00:1E:67:D4:39:B5' interfaces: + - eth1: '00:1E:67:D4:39:B4' - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' ipmiIp: 10.2.117.136 @@ -38,6 +40,7 @@ hosts: - name: host3 mac: '00:1E:67:D4:31:B2' interfaces: + - eth1: '00:1E:67:D4:31:B1' - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' ipmiIp: 10.2.117.138 @@ -50,6 +53,7 @@ hosts: - name: host4 mac: '00:1E:67:D4:34:67' interfaces: + - eth1: '00:1E:67:D4:34:66' - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' ipmiIp: 10.2.117.140 @@ -60,6 +64,7 @@ hosts: - name: host5 mac: '00:1E:67:D4:38:42' interfaces: + - eth1: '00:1E:67:D4:38:41' - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' ipmiIp: 10.2.117.142 diff --git a/util/ks.cfg b/util/ks.cfg index 62f2b110..41e6b74c 100644 --- a/util/ks.cfg +++ b/util/ks.cfg @@ -255,7 +255,7 @@ cp -rf ${SOURCE}/ansible/* /opt cp -rf ${SOURCE}/repos/* /opt cp -rf ${SOURCE}/loaders.tar.gz /opt cp -rf ${SOURCE}/pip /var/www/pip -cp -rf ${SOURCE}/pip-ops /var/www/pip-ops +cp -rf ${SOURCE}/pip-openstack /var/www/pip-openstack cp -rf ${SOURCE}/guestimg /var/www/guestimg tar -zxvf ${SOURCE}/app_packages/packages.tar.gz -C /var/www |