From f9875bf251a96f61b0cb6e1f81a16db50e736e24 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 3 Nov 2015 19:13:19 -0600 Subject: modified as per new bundle of contrail. Change-Id: I195afcfd7ec81fc4e71027ff8011b447f9d08964 --- ci/opencontrail/juju-deployer/contrail-ha.yaml | 19 +++---- ci/opencontrail/juju-deployer/contrail.yaml | 66 +++++++++++++--------- ci/opencontrail/juju-deployer/scripts/openstack.sh | 2 +- 3 files changed, 47 insertions(+), 40 deletions(-) (limited to 'ci/opencontrail/juju-deployer') diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index d978c599..7ca3471d 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -24,14 +24,11 @@ openstack: constraints: mem=1G options: network-manager: Neutron - neutron-gateway: - branch: lp:~sdn-charmers/charms/trusty/quantum-gateway/contrail - constraints: mem=1G glance: branch: lp:~openstack-charmers/charms/trusty/glance/next constraints: mem=1G neutron-api: - branch: lp:~openstack-charmers/charms/trusty/neutron-api/vpp + branch: lp:~openstack-charmers/charms/trusty/neutron-api/next constraints: mem=1G options: manage-neutron-plugin-legacy-mode: false @@ -47,9 +44,6 @@ openstack: - [ nova-compute, glance ] - [ glance, mysql ] - [ glance, keystone ] - - [ neutron-gateway, mysql ] - - [ "neutron-gateway:amqp", "rabbitmq-server:amqp" ] - - [ neutron-gateway, nova-cloud-controller ] - [ openstack-dashboard, keystone ] - [ neutron-api, mysql ] - [ neutron-api, rabbitmq-server ] @@ -60,12 +54,13 @@ contrail: inherits: openstack services: cassandra: - branch: lp:~sdn-charmers/charms/precise/cassandra/forced-install - series: precise + branch: lp:~stub/charms/trusty/cassandra/noauthentication constraints: mem=8G root-disk=20G + options: + authenticator: AllowAllAuthenticator units: 3 zookeeper: - branch: lp:~sdn-charmers/charms/precise/zookeeper/fix-symlink + branch: lp:~charmers/charms/precise/zookeeper/trunk series: precise constraints: mem=1G units: 3 @@ -105,11 +100,12 @@ contrail: - [ contrail-configuration, zookeeper ] - [ contrail-configuration, rabbitmq-server ] - [ contrail-configuration, keystone ] - - [ contrail-configuration, neutron-gateway ] - [ neutron-api-contrail, contrail-configuration ] - [ neutron-api-contrail, keystone ] + - [ "contrail-control:contrail-api", "contrail-configuration:contrail-api" ] - [ "contrail-control:contrail-discovery", "contrail-configuration:contrail-discovery" ] - [ "contrail-control:contrail-ifmap", "contrail-configuration:contrail-ifmap" ] + - [ contrail-control, keystone ] - [ "contrail-analytics:cassandra", "cassandra:database" ] - [ contrail-analytics, contrail-configuration ] - [ contrail-webui, keystone ] @@ -118,7 +114,6 @@ contrail: - [ "contrail-webui:cassandra", "cassandra:database" ] - [ nova-compute, neutron-contrail ] - [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ] - - [ neutron-contrail, neutron-gateway ] - [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ] - [ neutron-contrail, keystone ] - [ contrail-configuration, haproxy ] diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml index 68cda3e2..1601674f 100644 --- a/ci/opencontrail/juju-deployer/contrail.yaml +++ b/ci/opencontrail/juju-deployer/contrail.yaml @@ -52,9 +52,9 @@ openstack: to: - "lxc:ubuntu=0" - neutron-gateway: - branch: lp:~sdn-charmers/charms/trusty/quantum-gateway/contrail - constraints: tags=virtual +# neutron-gateway: +# branch: lp:~sdn-charmers/charms/trusty/quantum-gateway/contrail +# constraints: tags=virtual glance: branch: lp:~openstack-charmers/charms/trusty/glance/next @@ -64,7 +64,7 @@ openstack: neutron-api: branch: lp:~openstack-charmers/charms/trusty/neutron-api/vpp - constraints: tags=virtual +# constraints: tags=virtual to: - "lxc:ubuntu=0" options: @@ -81,35 +81,30 @@ openstack: - [ nova-compute, glance ] - [ glance, mysql ] - [ glance, keystone ] - - [ neutron-gateway, mysql ] - - [ "neutron-gateway:amqp", "rabbitmq-server:amqp" ] - - [ neutron-gateway, nova-cloud-controller ] - [ openstack-dashboard, keystone ] - [ neutron-api, mysql ] - [ neutron-api, rabbitmq-server ] - [ neutron-api, nova-cloud-controller ] - [ neutron-api, keystone ] - [ neutron-api, neutron-api-contrail ] + contrail: inherits: openstack services: cassandra: - branch: lp:~sdn-charmers/charms/precise/cassandra/forced-install - series: precise - constraints: tags=control + branch: lp:~stub/charms/trusty/cassandra/noauthentication options: - allow-single-node: true + authenticator: AllowAllAuthenticator + - "lxc:ubuntu=0" zookeeper: - branch: lp:~sdn-charmers/charms/precise/zookeeper/fix-symlink + branch: lp:~charmers/charms/precise/zookeeper/trunk series: precise - constraints: mem=1G to: - - "lxc:cassandra=0" + - "lxc:ubuntu=0" contrail-configuration: - branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/ssl - constraints: mem=4G + branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk to: - "lxc:ubuntu=0" # options: @@ -117,13 +112,11 @@ contrail: contrail-control: branch: lp:~sdn-charmers/charms/trusty/contrail-control/trunk - constraints: mem=2G to: - "lxc:ubuntu=0" contrail-analytics: branch: lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk - constraints: mem=4G to: - "lxc:ubuntu=0" @@ -134,20 +127,22 @@ contrail: neutron-api-contrail: branch: lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk -# options: -# overlay-network-type: 'vxlan gre' -# security-groups: true - neutron-contrail: branch: lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk + overrides: admin-role: admin relations: - [ "contrail-configuration:cassandra", "cassandra:database" ] + - [ contrail-configuration, zookeeper ] + - [ contrail-configuration, rabbitmq-server ] + - [ contrail-configuration, keystone ] - [ neutron-api-contrail, contrail-configuration ] - [ neutron-api-contrail, keystone ] + - [ "contrail-control:contrail-api", "contrail-configuration:contrail-api" ] - [ "contrail-control:contrail-discovery", "contrail-configuration:contrail-discovery" ] - [ "contrail-control:contrail-ifmap", "contrail-configuration:contrail-ifmap" ] + - [ contrail-control, keystone ] - [ "contrail-analytics:cassandra", "cassandra:database" ] - [ contrail-analytics, contrail-configuration ] - [ contrail-webui, keystone ] @@ -156,13 +151,9 @@ contrail: - [ "contrail-webui:cassandra", "cassandra:database" ] - [ nova-compute, neutron-contrail ] - [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ] - - [ neutron-contrail, neutron-gateway ] - [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ] - [ neutron-contrail, keystone ] - - [ contrail-configuration, zookeeper ] - - [ contrail-configuration, rabbitmq-server ] - - [ contrail-configuration, keystone ] - - [ contrail-configuration, neutron-gateway ] + precise-icehouse-contrail: inherits: contrail series: precise @@ -191,3 +182,24 @@ trusty-juno-contrail: charm: cs:trusty/rabbitmq-server overrides: openstack-origin: cloud:trusty-juno +trusty-kilo-contrail: + inherits: contrail + series: trusty + services: + mysql: + charm: cs:trusty/mysql + rabbitmq-server: + charm: cs:trusty/rabbitmq-server + overrides: + openstack-origin: cloud:trusty-kilo +trusty-liberty-contrail: + inherits: contrail + series: trusty + services: + mysql: + charm: cs:trusty/mysql + rabbitmq-server: + charm: cs:trusty/rabbitmq-server + overrides: + openstack-origin: cloud:trusty-liberty + diff --git a/ci/opencontrail/juju-deployer/scripts/openstack.sh b/ci/opencontrail/juju-deployer/scripts/openstack.sh index 7c0a8ab0..8926a935 100755 --- a/ci/opencontrail/juju-deployer/scripts/openstack.sh +++ b/ci/opencontrail/juju-deployer/scripts/openstack.sh @@ -23,7 +23,7 @@ unitMachine() mkdir -m 0700 -p cloud controller_address=$(unitAddress keystone 0) -configOpenrc admin openstack admin http://$controller_address:5000/v2.0 RegionOne > cloud/admin-openrc +configOpenrc admin openstck admin http://$controller_address:5000/v2.0 RegionOne > cloud/admin-openrc chmod 0600 cloud/admin-openrc machine=$(unitMachine nova-cloud-controller 0) -- cgit 1.2.3-korg