modified as per new bundle of contrail.

Change-Id: I195afcfd7ec81fc4e71027ff8011b447f9d08964

7 files changed, 13 insertions, 32 deletions

diff --git a/ci/opencontrail/cloud-sh-contrail/config-precise.sh b/ci/opencontrail/cloud-sh-contrail/config-precise.sh
index 7ef7f322..b22f0a6d 100644
--- a/ci/opencontrail/cloud-sh-contrail/config-precise.sh
+++ b/ci/opencontrail/cloud-sh-contrail/config-precise.sh
@@ -32,9 +32,6 @@ CHARM_NEUTRON_API_CONTRAIL=local:precise/neutron-api-contrail
 
 CHARM_NEUTRON_CONTRAIL=local:precise/neutron-contrail
 
-CHARM_NEUTRON_GATEWAY=local:precise/quantum-gateway
-CHARM_NEUTRON_GATEWAY_DEPLOY_OPTS="--config config-precise.yaml"
-
 CHARM_NOVA_CLOUD_CONTROLLER=local:precise/nova-cloud-controller
 CHARM_NOVA_CLOUD_CONTROLLER_DEPLOY_OPTS="--config config-precise.yaml"
 
diff --git a/ci/opencontrail/cloud-sh-contrail/config-precise.yaml b/ci/opencontrail/cloud-sh-contrail/config-precise.yaml
index 72c08b67..ebdd0337 100644
--- a/ci/opencontrail/cloud-sh-contrail/config-precise.yaml
+++ b/ci/opencontrail/cloud-sh-contrail/config-precise.yaml
@@ -1,5 +1,5 @@
 cassandra:
-  allow-single-node: true
+  authenticator: AllowAllAuthenticator
 
 contrail-analytics:
   openstack-origin: cloud:precise-icehouse
@@ -25,9 +25,6 @@ neutron-api:
   manage-neutron-plugin-legacy-mode: false
   openstack-origin: cloud:precise-icehouse
 
-neutron-gateway:
-  openstack-origin: cloud:precise-icehouse
-
 nova-cloud-controller:
   network-manager: Neutron
   openstack-origin: cloud:precise-icehouse
diff --git a/ci/opencontrail/cloud-sh-contrail/config-trusty-juno.sh b/ci/opencontrail/cloud-sh-contrail/config-trusty-juno.sh
index 6719e874..aeebf861 100644
--- a/ci/opencontrail/cloud-sh-contrail/config-trusty-juno.sh
+++ b/ci/opencontrail/cloud-sh-contrail/config-trusty-juno.sh
@@ -2,7 +2,7 @@ export JUJU_REPOSITORY=../charms
 
 DEFAULT_SERIES=trusty
 
-CHARM_CASSANDRA=local:precise/cassandra
+CHARM_CASSANDRA=local:trusty/cassandra
 CHARM_CASSANDRA_DEPLOY_OPTS="--config config-trusty-juno.yaml"
 
 CHARM_CONTRAIL_ANALYTICS=local:trusty/contrail-analytics
@@ -32,9 +32,6 @@ CHARM_NEUTRON_API_CONTRAIL=local:trusty/neutron-api-contrail
 
 CHARM_NEUTRON_CONTRAIL=local:trusty/neutron-contrail
 
-CHARM_NEUTRON_GATEWAY=local:trusty/quantum-gateway
-CHARM_NEUTRON_GATEWAY_DEPLOY_OPTS="--config config-trusty-juno.yaml"
-
 CHARM_NOVA_CLOUD_CONTROLLER=local:trusty/nova-cloud-controller
 CHARM_NOVA_CLOUD_CONTROLLER_DEPLOY_OPTS="--config config-trusty-juno.yaml"
 
diff --git a/ci/opencontrail/cloud-sh-contrail/config-trusty-juno.yaml b/ci/opencontrail/cloud-sh-contrail/config-trusty-juno.yaml
index 3767364d..7db15be9 100644
--- a/ci/opencontrail/cloud-sh-contrail/config-trusty-juno.yaml
+++ b/ci/opencontrail/cloud-sh-contrail/config-trusty-juno.yaml
@@ -1,5 +1,5 @@
 cassandra:
-  allow-single-node: true
+  authenticator: AllowAllAuthenticator
 
 contrail-analytics:
   openstack-origin: cloud:trusty-juno
@@ -25,9 +25,6 @@ neutron-api:
   manage-neutron-plugin-legacy-mode: false
   openstack-origin: cloud:trusty-juno
 
-neutron-gateway:
-  openstack-origin: cloud:trusty-juno
-
 nova-cloud-controller:
   network-manager: Neutron
   openstack-origin: cloud:trusty-juno
diff --git a/ci/opencontrail/cloud-sh-contrail/config-trusty.sh b/ci/opencontrail/cloud-sh-contrail/config-trusty.sh
index 16743b0e..9d38461c 100644
--- a/ci/opencontrail/cloud-sh-contrail/config-trusty.sh
+++ b/ci/opencontrail/cloud-sh-contrail/config-trusty.sh
@@ -2,7 +2,7 @@ export JUJU_REPOSITORY=../charms
 
 DEFAULT_SERIES=trusty
 
-CHARM_CASSANDRA=local:precise/cassandra
+CHARM_CASSANDRA=local:trusty/cassandra
 CHARM_CASSANDRA_DEPLOY_OPTS="--config config-trusty.yaml"
 
 CHARM_CONTRAIL_ANALYTICS=local:trusty/contrail-analytics
@@ -28,8 +28,6 @@ CHARM_NEUTRON_API_CONTRAIL=local:trusty/neutron-api-contrail
 
 CHARM_NEUTRON_CONTRAIL=local:trusty/neutron-contrail
 
-CHARM_NEUTRON_GATEWAY=local:trusty/quantum-gateway
-
 CHARM_NOVA_CLOUD_CONTROLLER=local:trusty/nova-cloud-controller
 CHARM_NOVA_CLOUD_CONTROLLER_DEPLOY_OPTS="--config config-trusty.yaml"
 
diff --git a/ci/opencontrail/cloud-sh-contrail/config-trusty.yaml b/ci/opencontrail/cloud-sh-contrail/config-trusty.yaml
index 7d4bf58d..abb862ad 100644
--- a/ci/opencontrail/cloud-sh-contrail/config-trusty.yaml
+++ b/ci/opencontrail/cloud-sh-contrail/config-trusty.yaml
@@ -1,5 +1,5 @@
 cassandra:
-  allow-single-node: true
+  authenticator: AllowAllAuthenticator
 
 keystone:
   admin-password: password
diff --git a/ci/opencontrail/cloud-sh-contrail/openstack.sh b/ci/opencontrail/cloud-sh-contrail/openstack.sh
index 960a9934..b1234fcc 100755
--- a/ci/opencontrail/cloud-sh-contrail/openstack.sh
+++ b/ci/opencontrail/cloud-sh-contrail/openstack.sh
@@ -56,7 +56,7 @@ fi
 juju bootstrap
 waitForMachine 0
 
-spare_cpus=$(($(grep processor /proc/cpuinfo | wc -l) - 5))
+spare_cpus=$(($(grep processor /proc/cpuinfo | wc -l) - 4))
 if [ $spare_cpus -gt 0 ]; then
 	spare_cpus=$(((spare_cpus * 3) / 4))
 else
@@ -67,8 +67,6 @@ extra_cpus=0
 [ $spare_cpus -ne 0 ] && extra_cpus=$((1 + (((spare_cpus - 1) * 3) / 4))) && spare_cpus=$((spare_cpus - extra_cpus))
 juju add-machine --constraints "cpu-cores=$((1 + extra_cpus)) mem=12G root-disk=20G" --series $DEFAULT_SERIES
 
-juju deploy --constraints mem=1G $CHARM_NEUTRON_GATEWAY_DEPLOY_OPTS "${CHARM_NEUTRON_GATEWAY:-quantum-gateway}" neutron-gateway
-
 extra_cpus=0
 [ $spare_cpus -ne 0 ] && extra_cpus=$((1 + (((spare_cpus - 1) * 3) / 4))) && spare_cpus=$((spare_cpus - extra_cpus))
 juju deploy --constraints "cpu-cores=$((1 + extra_cpus)) mem=4G root-disk=20G" $CHARM_NOVA_COMPUTE_DEPLOY_OPTS "${CHARM_NOVA_COMPUTE:-nova-compute}"
@@ -79,9 +77,9 @@ waitForMachine 1
 juju scp lxc-network.sh 1:
 juju run --machine 1 "sudo ./lxc-network.sh"
 
-waitForMachine 4
-juju scp lxc-network.sh 4:
-juju run --machine 4 "sudo ./lxc-network.sh"
+waitForMachine 3
+juju scp lxc-network.sh 3:
+juju run --machine 3 "sudo ./lxc-network.sh"
 
 juju deploy --to lxc:1 $CHARM_MYSQL_DEPLOY_OPTS "${CHARM_MYSQL:-mysql}"
 juju deploy --to lxc:1 $CHARM_RABBITMQ_SERVER_DEPLOY_OPTS "${CHARM_RABBITMQ_SERVER:-rabbitmq-server}"
@@ -96,7 +94,7 @@ juju deploy --to lxc:1 $CHARM_CONTRAIL_CONFIGURATION_DEPLOY_OPTS "${CHARM_CONTRA
 juju deploy --to lxc:1 $CHARM_CONTRAIL_CONTROL_DEPLOY_OPTS "${CHARM_CONTRAIL_CONTROL:-contrail-control}"
 juju deploy --to lxc:1 $CHARM_CONTRAIL_ANALYTICS_DEPLOY_OPTS "${CHARM_CONTRAIL_ANALYTICS:-contrail-analytics}"
 juju deploy --to lxc:1 $CHARM_CONTRAIL_WEBUI_DEPLOY_OPTS "${CHARM_CONTRAIL_WEBUI:-contrail-webui}"
-juju deploy --to lxc:4 $CHARM_CASSANDRA_DEPLOY_OPTS "${CHARM_CASSANDRA:-cassandra}"
+juju deploy --to lxc:3 $CHARM_CASSANDRA_DEPLOY_OPTS "${CHARM_CASSANDRA:-cassandra}"
 juju deploy $CHARM_NEUTRON_API_CONTRAIL_DEPLOY_OPTS "${CHARM_NEUTRON_API_CONTRAIL:-neutron-api-contrail}"
 juju deploy $CHARM_NEUTRON_CONTRAIL_DEPLOY_OPTS "${CHARM_NEUTRON_CONTRAIL:-neutron-contrail}"
 
@@ -106,14 +104,11 @@ waitForService mysql keystone
 juju add-relation keystone mysql
 sleep 60
 
-waitForService rabbitmq-server nova-cloud-controller glance openstack-dashboard neutron-gateway nova-compute
+waitForService rabbitmq-server nova-cloud-controller glance openstack-dashboard nova-compute
 juju add-relation nova-cloud-controller mysql
 juju add-relation nova-cloud-controller rabbitmq-server
 juju add-relation nova-cloud-controller glance
 juju add-relation nova-cloud-controller keystone
-juju add-relation neutron-gateway mysql
-juju add-relation neutron-gateway:amqp rabbitmq-server:amqp
-juju add-relation neutron-gateway nova-cloud-controller
 juju add-relation nova-compute:shared-db mysql:shared-db
 juju add-relation nova-compute:amqp rabbitmq-server:amqp
 juju add-relation nova-compute glance
@@ -137,19 +132,19 @@ juju add-relation contrail-configuration:cassandra cassandra:database
 juju add-relation contrail-configuration zookeeper
 juju add-relation contrail-configuration rabbitmq-server
 juju add-relation contrail-configuration keystone
-juju add-relation contrail-configuration neutron-gateway
 sleep 60
 
 waitForService contrail-control contrail-analytics
 juju add-relation neutron-api-contrail contrail-configuration
 juju add-relation neutron-api-contrail keystone
+juju add-relation contrail-control:contrail-api contrail-configuration:contrail-api
 juju add-relation contrail-control:contrail-discovery contrail-configuration:contrail-discovery
 juju add-relation contrail-control:contrail-ifmap contrail-configuration:contrail-ifmap
+juju add-relation contrail-control keystone
 juju add-relation contrail-analytics:cassandra cassandra:database
 juju add-relation contrail-analytics contrail-configuration
 juju add-relation nova-compute neutron-contrail
 juju add-relation neutron-contrail:contrail-discovery contrail-configuration:contrail-discovery
-juju add-relation neutron-contrail neutron-gateway
 juju add-relation neutron-contrail:contrail-api contrail-configuration:contrail-api
 juju add-relation neutron-contrail keystone
 sleep 60