summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-07-19 09:25:25 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-07-19 09:26:27 -0500
commit9aebd3628be8e994cda79370f55bcd470b3185ca (patch)
tree047d0c02d9224039c8ee2ebf826f4764c5f4ddc8 /ci
parentecfd70bde101afc0c6b96730ad2a2e1be64c5650 (diff)
modified to enabled congress as charm has a fix now.
Change-Id: I5c8bf2fafadc1e1df09da6beaad17c373c6a4a74 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
-rw-r--r--ci/bundle_tpl/relations.yaml6
-rwxr-xr-xci/openstack.sh60
2 files changed, 33 insertions, 33 deletions
diff --git a/ci/bundle_tpl/relations.yaml b/ci/bundle_tpl/relations.yaml
index e7bc6799..afbeeb11 100644
--- a/ci/bundle_tpl/relations.yaml
+++ b/ci/bundle_tpl/relations.yaml
@@ -38,9 +38,9 @@
- [ 'heat:shared-db', 'mysql:shared-db' ]
- [ 'heat:identity-service', 'keystone:identity-service' ]
- [ 'heat:amqp', 'rabbitmq-server:amqp' ]
-# - [ 'congress:shared-db', 'mysql:shared-db' ]
-# - [ 'congress:identity-service', 'keystone:identity-service' ]
-# - [ 'congress:amqp', 'rabbitmq-server:amqp' ]
+ - [ 'congress:shared-db', 'mysql:shared-db' ]
+ - [ 'congress:identity-service', 'keystone:identity-service' ]
+ - [ 'congress:amqp', 'rabbitmq-server:amqp' ]
{% if os.lxd %}
- [ 'nova-compute:lxd', 'lxd:lxd' ]
{% endif %}
diff --git a/ci/openstack.sh b/ci/openstack.sh
index d0d7f8a0..7f5c4c70 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -173,36 +173,36 @@ if [ "$API_FQDN" != "''" ]; then
openstack endpoint create --region Canonical policy public $CONGRESS_NEW_PUB_ENDPOINT
fi
-#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
+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
##enable extra stuff only if testing manually