opnfvdistro=$3
opnfvos=$4
-jujuver=`juju --version`
-
if [ -f ./deployconfig.yaml ];then
EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 `
## get gateway mac
EXTNET_GW_MAC=$(juju ssh nova-compute/0 "arp -a ${EXTNET_GW} | grep -Eo '([0-9a-fA-F]{2})(([/\s:-][0-9a-fA-F]{2}){5})'")
## set external gateway mac in onos
- if [[ "$jujuver" < "2" ]]; then
- juju set onos-controller gateway-mac=$EXTNET_GW_MAC
- else
- juju config onos-controller gateway-mac=$EXTNET_GW_MAC
- fi
+ juju config onos-controller gateway-mac=$EXTNET_GW_MAC
}
unitAddress() {
- if [[ "$jujuver" < "2" ]]; then
- juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null
- else
- juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"applications\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null
- fi
+ juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"applications\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null
}
unitMachine() {
- if [[ "$jujuver" < "2" ]]; then
- juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
- else
- juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"applications\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
- fi
+ juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"applications\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
}
keystoneIp() {
if [ $(juju status keystone --format=short | grep " keystone"|wc -l) == 1 ];then
unitAddress keystone 0
else
- if [[ "$jujuver" < "2" ]]; then
- juju get keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']" | cut -d " " -f 1
- else
- juju config keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']" | cut -d " " -f 1
- fi
+ juju config keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']" | cut -d " " -f 1
fi
}
mkdir -m 0700 -p cloud
keystoneIp=$(keystoneIp)
- if [[ "$jujuver" < "2" ]]; then
- adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null)
- else
- adminPasswd=$(juju config keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null)
- fi
+ adminPasswd=$(juju config keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['admin-password']['value']" | cut -d " " -f 1)
v3api=`juju config keystone preferred-api-version`
export OS_PASSWORD=$2
export OS_IDENTITY_API_VERSION=3
export OS_REGION_NAME=$5
+export OS_INTERFACE=public
#export OS_INSECURE=true
#export OS_CASSL=~/joid_config/ca.pem
EOF
if [ "onos" == "$opnfvsdn" ]; then
launch_eth
- neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \
- --router:external=True
-if [ "ocl" == "$opnfvsdn" ]; then
- if [ ! neutron net-show ext-net > /dev/null 2>&1 ]
- then
- neutron net-create ext-net
- LAST_UNIT=`juju status | grep nova-compute/ | tail -1 | cut -c14`
- for ii in {0..$LAST_UNIT}
- do
- ssh $II sudo docker exec contrail-controller \
- python /opt/contrail/utils/provision_vgw_interface.py\
- --oper create --interface vgw1 --subnets $SUBNET --routes 0.0.0.0/24 --vrf default-domain:admin:$FIP-VN:$FIP-VN
- done
- fi
+ openstack network show ext-net > /dev/null 2>&1 || openstack network create \
+ --external --share --enable ext-net
+elif [ "ocl" == "$opnfvsdn" ]; then
+ openstack network show ext-net > /dev/null 2>&1 || openstack network create \
+ --external --share --enable ext-net
+
else
- neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \
- --router:external=True \
- --provider:network_type flat \
- --provider:physical_network physnet1
+ openstack network show ext-net > /dev/null 2>&1 || openstack network create \
+ --provider-network-type flat \
+ --provider-physical-network physnet1 \
+ --external --share --enable ext-net
fi
-neutron subnet-show ext-subnet > /dev/null 2>&1 || neutron subnet-create ext-net \
- --name ext-subnet --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
- --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET
+openstack subnet show ext-subnet > /dev/null 2>&1 || openstack subnet create \
+ --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
+ --no-dhcp --gateway $EXTNET_GW --network ext-net --subnet-range $EXTNET_NET ext-subnet
-domain_id=$(openstack domain show admin_domain -f value -c id)
-project_id=$(openstack project show admin --domain $domain_id -f value -c id)
-
-openstack role add --project $project_id --user admin admin || true
+# Ocl can push packets to the fabric network in order to reach a gateway if BGP/L3VPN hasn't been configured.
+if [ "ocl" == "$opnfvsdn" ]; then
+ echo "Creating simple gateway functions on ocl vRouters"
+ juju run --application nova-compute "sudo \
+ python /opt/contrail/utils/provision_vgw_interface.py \
+ --oper create --interface vgw1 --subnets $EXTNET_NET --routes 0.0.0.0/24 --vrf default-domain:admin:ext-net:ext-net"
+fi
#congress team is not updating and supporting charm anymore so defer it.