Code Review / joid.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Adding the OS_DOMAIN_PROJECT_ID
[joid.git] / ci / openstack.sh
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 06e59c4..e41dbf8 100755 (executable)
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -92,41 +92,60 @@ create_openrc() {
         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
+    v3api=`juju config keystone  preferred-api-version`
+
+    if [[ "$v3api" == "3" ]]; then
+        configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v3 RegionOne publicURL > ~/joid_config/admin-openrc
+        chmod 0600 ~/joid_config/admin-openrc
+        source ~/joid_config/admin-openrc
+        projectid=`openstack project show admin -c id -f value`
+        projectdomainid=`openstack domain show admin_domain -c id -f value`
+        urlapi=`openstack catalog show keystone --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)['endpoints']" | grep public | cut -d " " -f 4`
+        configOpenrc admin $adminPasswd admin $urlapi RegionOne publicURL $projectid $projectdomainid > ~/joid_config/admin-openrcinternal
+        configOpenrc admin $adminPasswd admin $urlapi RegionOne publicURL $projectid $projectdomainid > ~/joid_config/admin-openrc
+    else
+        configOpenrc2 admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > ~/joid_config/admin-openrc
+        chmod 0600 ~/joid_config/admin-openrc
+    fi
 }
 
-configOpenrc() {
-if [ "$API_FQDN" != "None" ]; then
-    cat <<-EOF
-        export SERVICE_ENDPOINT=$4
-        unset SERVICE_TOKEN
-        unset SERVICE_ENDPOINT
-        export OS_USERNAME=$1
-        export OS_PASSWORD=$2
-        export OS_TENANT_NAME=$3
-        export OS_AUTH_URL=$4
-        export OS_REGION_NAME=$5
-        export OS_ENDPOINT_TYPE='internalURL'
-        export CINDER_ENDPOINT_TYPE='internalURL'
-        export GLANCE_ENDPOINT_TYPE='internalURL'
-        export KEYSTONE_ENDPOINT_TYPE='internalURL'
-        export NEUTRON_ENDPOINT_TYPE='internalURL'
-        export NOVA_ENDPOINT_TYPE='internalURL'
-EOF
-else
-    cat <<-EOF
-        export SERVICE_ENDPOINT=$4
-        unset SERVICE_TOKEN
-        unset SERVICE_ENDPOINT
-        export OS_USERNAME=$1
-        export OS_PASSWORD=$2
-        export OS_TENANT_NAME=$3
-        export OS_AUTH_URL=$4
-        export OS_REGION_NAME=$5
+configOpenrc2() {
+cat <<-EOF
+export SERVICE_ENDPOINT=$4
+unset SERVICE_TOKEN
+unset SERVICE_ENDPOINT
+export OS_USERNAME=$1
+export OS_PASSWORD=$2
+export OS_TENANT_NAME=$3
+export OS_AUTH_URL=$4
+export OS_REGION_NAME=$5
 EOF
+}
 
-fi
+configOpenrc() {
+cat <<-EOF
+export OS_NO_CACHE='true'
+export OS_TENANT_NAME=$3
+#export OS_TENANT_ID=$7
+export OS_PROJECT_NAME=$3
+export OS_USERNAME=$1
+export OS_PASSWORD=$2
+export OS_IDENTITY_API_VERSION=3
+export OS_DEFAULT_DOMAIN=admin_domain
+export OS_USER_DOMAIN_NAME=admin_domain
+export OS_PROJECT_DOMAIN_NAME=admin_domain
+export OS_PROJECT_DOMAIN_ID=$8
+export OS_AUTH_STRATEGY='keystone'
+export OS_REGION_NAME=$5
+export CINDER_ENDPOINT_TYPE=$6
+export GLANCE_ENDPOINT_TYPE=$6
+export KEYSTONE_ENDPOINT_TYPE=$6
+export NOVA_ENDPOINT_TYPE=$6
+export NEUTRON_ENDPOINT_TYPE=$6
+export OS_ENDPOINT_TYPE=$6
+export OS_INTERFACE=public
+export OS_AUTH_URL=$4
+EOF
 }
 
 if [ "$API_FQDN" != "None" ]; then
@@ -219,72 +238,51 @@ echo "...... deploy end public api proxy ......"
 
 if [ "onos" == "$opnfvsdn" ]; then
     launch_eth
-    neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net --router:external=True
-    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
-    #neutron subnet-create ext-net --name ext-subnet $EXTNET_NET
-    #update_gw_mac
-elif [ "nosdn" == "$opnfvsdn" ]; then
     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
-
-    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
-
-elif [ "odl" == "$opnfvsdn" ]; then
-    neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \
-                                                   --router:external=True \
-                                                   --provider:network_type vxlan
-
-    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
- else
+                                                   --router:external=True
+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
-
-    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
 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
+
+#congress team is not updating and supporting charm anymore so defer it.
 
 # Create Congress datasources
-sudo apt-get install -y python-congressclient
-
-openstack congress datasource create nova "nova" \
-  --config username=$OS_USERNAME \
-  --config tenant_name=$OS_TENANT_NAME \
-  --config password=$OS_PASSWORD \
-  --config auth_url=http://$keystoneIp:5000/v2.0
-openstack congress datasource create neutronv2 "neutronv2" \
-  --config username=$OS_USERNAME \
-  --config tenant_name=$OS_TENANT_NAME \
-  --config password=$OS_PASSWORD \
-  --config auth_url=http://$keystoneIp:5000/v2.0
-openstack congress datasource create ceilometer "ceilometer" \
-  --config username=$OS_USERNAME \
-  --config tenant_name=$OS_TENANT_NAME \
-  --config password=$OS_PASSWORD \
-  --config auth_url=http://$keystoneIp:5000/v2.0
-openstack congress datasource create cinder "cinder" \
-  --config username=$OS_USERNAME \
-  --config tenant_name=$OS_TENANT_NAME \
-  --config password=$OS_PASSWORD \
-  --config auth_url=http://$keystoneIp:5000/v2.0
-openstack congress datasource create glancev2 "glancev2" \
-  --config username=$OS_USERNAME \
-  --config tenant_name=$OS_TENANT_NAME \
-  --config password=$OS_PASSWORD \
-  --config auth_url=http://$keystoneIp:5000/v2.0
-openstack congress datasource create keystone "keystone" \
-  --config username=$OS_USERNAME \
-  --config tenant_name=$OS_TENANT_NAME \
-  --config password=$OS_PASSWORD \
-  --config auth_url=http://$keystoneIp:5000/v2.0
+#sudo apt-get install -y python-congressclient
+
+#openstack congress datasource create nova "nova" \
+#  --config username=$OS_USERNAME \
+#  --config tenant_name=$OS_TENANT_NAME \
+#  --config password=$OS_PASSWORD \
+#  --config auth_url=http://$keystoneIp:5000/v2.0
+#openstack congress datasource create neutronv2 "neutronv2" \
+#  --config username=$OS_USERNAME \
+#  --config tenant_name=$OS_TENANT_NAME \
+#  --config password=$OS_PASSWORD \
+#  --config auth_url=http://$keystoneIp:5000/v2.0
+#openstack congress datasource create ceilometer "ceilometer" \
+#  --config username=$OS_USERNAME \
+#  --config tenant_name=$OS_TENANT_NAME \
+#  --config password=$OS_PASSWORD \
+#  --config auth_url=http://$keystoneIp:5000/v2.0
+#openstack congress datasource create cinder "cinder" \
+#  --config username=$OS_USERNAME \
+#  --config tenant_name=$OS_TENANT_NAME \
+#  --config password=$OS_PASSWORD \
+#  --config auth_url=http://$keystoneIp:5000/v2.0
+#openstack congress datasource create glancev2 "glancev2" \
+#  --config username=$OS_USERNAME \
+#  --config tenant_name=$OS_TENANT_NAME \
+#  --config password=$OS_PASSWORD \
+#  --config auth_url=http://$keystoneIp:5000/v2.0
+#openstack congress datasource create keystone "keystone" \
+#  --config username=$OS_USERNAME \
+#  --config tenant_name=$OS_TENANT_NAME \
+#  --config password=$OS_PASSWORD \
+#  --config auth_url=http://$keystoneIp:5000/v2.0
Flexible OPNFV platform deployment. Archived as per RT68096