diff options
| -rw-r--r-- | ci/bundle_tpl/relations.yaml | 6 | ||||
| -rwxr-xr-x | ci/openstack.sh | 60 |
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 |