Add Congress datasource create to post-install script

JIRA: COPPER-2

Added to current script version; fixed unterminated quote
Replace $CIDR with $EXTNET_NET

Change-Id: Iaeb35b78ba11e9139014202cf68648ff9b4d6e35
Signed-off-by: blsaws <bryan.sullivan@att.com>

diff --git a/ci/openstack.sh b/ci/openstack.sh
index 9c93c10..5506209 100755 (executable)
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -100,7 +100,7 @@ nova keypair-add --pub-key ~/.ssh/id_rsa.pub ubuntu-keypair
 if [ "onos" == "$1" ]; then
     launch_eth
     neutron net-create ext-net --shared --router:external=True
-    neutron subnet-create ext-net --name ext-subnet $CIDR"
+    neutron subnet-create ext-net --name ext-subnet $EXTNET_NET
     update_gw_mac
 else
     neutron net-create ext-net --shared --router:external --provider:physical_network external --provider:network_type flat
@@ -129,3 +129,36 @@ done
 #http://docs.openstack.org/juno/install-guide/install/apt/content/launch-instance-neutron.html
 # nova boot --flavor m1.small --image cirros-0.3.3-x86_64 --nic net-id=b65479a4-3638-4595-9245-6e41ccd8bfd8 --security-group default --key-name ubuntu-keypair demo-instance1
 # nova floating-ip-associate demo-instance1 10.5.8.35
+
+# 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