diff options
| -rwxr-xr-x | ci/clean.sh | 2 | ||||
| -rwxr-xr-x | ci/deploy.sh | 2 | ||||
| -rwxr-xr-x | ci/opencontrail/fetch-charms.sh | 11 | ||||
| -rwxr-xr-x | ci/openstack.sh | 53 | ||||
| -rwxr-xr-x | juju/configure-juju-on-openstack | 2 | ||||
| -rwxr-xr-x | juju/joid-configure-openstack | 35 |
6 files changed, 50 insertions, 55 deletions
diff --git a/ci/clean.sh b/ci/clean.sh index 4b308fd0..0cd20761 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -16,6 +16,7 @@ if [[ "$jujuver" > "2" ]]; then rm -rf precise rm -rf trusty rm -rf xenial + sudo sysctl -w vm.drop_caches=3 elif [ -d $HOME/.juju/environments ]; then echo " " > status.txt juju status &>>status.txt || true @@ -33,5 +34,6 @@ elif [ -d $HOME/.juju/environments ]; then rm -rf $HOME/.juju/.deployer-store-cache rm -rf $HOME/.juju/environments rm -rf $HOME/.juju/ssh + sudo sysctl -w vm.drop_caches=3 fi diff --git a/ci/deploy.sh b/ci/deploy.sh index 09427476..7d683cf8 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -184,7 +184,7 @@ echo "...... deployment finished ......." # creating heat domain after puching the public API into /etc/hosts if [[ "$jujuver" > "2" ]]; then - status=`juju run-action do heat/0 domain-setup` + status=`juju run-action heat/0 domain-setup` echo $status else status=`juju action do heat/0 domain-setup` diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index 95dd633f..908f7c11 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -63,11 +63,8 @@ git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api.git $di #charm pull cs:~openstack-charmers-next/lxd xenial/lxd # Controller specific charm -cd /tmp -rm -rf ovno git clone https://git.opnfv.org/ovno.git -cd ovno/charms -tar cf /tmp/charms.tar trusty -cd ~ -tar xf /tmp/charms.tar - +cd ovno/charms/trusty +mv * ../../../$distro/ +cd ../../../ +rm -rf ovno diff --git a/ci/openstack.sh b/ci/openstack.sh index 8efaac53..a5b8a8ca 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -14,6 +14,8 @@ opnfvlab=$2 opnfvdistro=$3 opnfvos=$4 +jujuver=`juju --version` + if [ -f ./deployconfig.yaml ];then EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 ` @@ -45,23 +47,39 @@ update_gw_mac() { ## 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 - juju set onos-controller gateway-mac=$EXTNET_GW_MAC + if [[ "$jujuver" < "2" ]]; then + juju set onos-controller gateway-mac=$EXTNET_GW_MAC + else + juju config onos-controller gateway-mac=$EXTNET_GW_MAC + fi } unitAddress() { - juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null + 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 } unitMachine() { - juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null + 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 } keystoneIp() { - KEYSTONE=$(juju status keystone |grep public-address|sed -- 's/.*\: //') - if [ $(echo $KEYSTONE|wc -w) == 1 ];then - echo $KEYSTONE + KEYSTONE=$(juju status keystone --format=short | grep " keystone") + if [ $(echo $KEYSTONE|wc -l) == 1 ];then + unitAddress keystone 0 else - juju get keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']" + if [[ "$jujuver" < "2" ]]; then + juju get keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']" + else + juju config keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']" + fi fi } @@ -69,9 +87,14 @@ keystoneIp() { create_openrc() { mkdir -m 0700 -p cloud keystoneIp=$(keystoneIp) - adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null) - configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > cloud/admin-openrc - chmod 0600 cloud/admin-openrc + 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 + + configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > ~/joid_config/admin-openrc + chmod 0600 ~/joid_config/admin-openrc } configOpenrc() { @@ -103,8 +126,14 @@ fi if [ "$API_FQDN" != "None" ]; then # Push api fqdn local ip to all /etc/hosts - API_FQDN=$(juju get keystone | python -c "import yaml; import sys;\ - print yaml.load(sys.stdin)['settings']['os-public-hostname']['value']") + if [[ "$jujuver" < "2" ]]; then + API_FQDN=$(juju get keystone | python -c "import yaml; import sys;\ + print yaml.load(sys.stdin)['settings']['os-public-hostname']['value']") + else + API_FQDN=$(juju config keystone | python -c "import yaml; import sys;\ + print yaml.load(sys.stdin)['settings']['os-public-hostname']['value']") + fi + KEYSTONEIP=$(keystoneIp) juju run --all "if grep $API_FQDN /etc/hosts > /dev/null; then \ diff --git a/juju/configure-juju-on-openstack b/juju/configure-juju-on-openstack index 1429b544..6458e6c2 100755 --- a/juju/configure-juju-on-openstack +++ b/juju/configure-juju-on-openstack @@ -27,7 +27,7 @@ set -ex echo "This command is run to launch the first instance on a new Orange box Openstack deployment" -source ~/nova.rc +source ~/joid_config/admin-openrc associated=0 #Create a floating IP for the instance diff --git a/juju/joid-configure-openstack b/juju/joid-configure-openstack index 231e46ac..1f3b8876 100755 --- a/juju/joid-configure-openstack +++ b/juju/joid-configure-openstack @@ -22,40 +22,7 @@ echo "This command is run to configure an Orange-Box Openstack deployment" NEUTRON_FIXED_NET_CIDR="192.168.16.0/22" -#Check if VIP is set on keystone -#keystone_VIP=`juju get-config keystone| python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"settings\"][\"vip\"][\"value\"]"||true` -keystone_VIP=`juju get keystone| python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"settings\"][\"vip\"][\"value\"]"||true` - -keystoneIp() { - KEYSTONE=$(juju status keystone |grep public-address|sed -- 's/.*\: //') - if [ $(echo $KEYSTONE|wc -w) == 1 ];then - echo $KEYSTONE - else - juju get keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']" - fi -} - -if [ -n "$keystone_VIP" ] -then - keystone=$keystone_VIP -else - #if os-public-hostname is set and not VIP assume we need to use those at OpenStack endpoints. - keystone=$(keystoneIp) - keystone_PUBENDPOINT=`juju get keystone| python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"settings\"][\"os-public-hostname\"][\"value\"]"||true` -fi - - -echo "export SERVICE_ENDPOINT=http://$keystone:35357/v2.0/ -unset SERVICE_TOKEN -unset SERVICE_ENDPOINT -export OS_AUTH_URL=http://$keystone:35357/v2.0/ -export OS_USERNAME=$(juju get keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"settings\"][\"admin-user\"][\"value\"]") -export OS_PASSWORD=$(juju get keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"settings\"][\"admin-password\"][\"value\"]") -export OS_TENANT_NAME=admin -export OS_REGION_NAME=$(juju get keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"settings\"][\"region\"][\"value\"]") -" > ~/nova.rc - -source ~/nova.rc +source ~/joid_config/admin-openrc # Determine the tenant id for the configured tenant name. export TENANT_ID="$(openstack project list | grep $OS_TENANT_NAME | awk '{ print $2 }')" |