summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-11-16 17:12:46 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2015-11-16 20:16:25 -0600
commitae62d64e874c425eb3136dc42a80d5cb41a3e7f3 (patch)
tree01906ebf3f2df81c3f0466d65ae2f71fe99cd45c
parentc0bbbd8492495fbbce8855df7d64399681bf80f0 (diff)
modified the bundle and script to have contrail deployed in non ha
node. modified the bundle for other release of openstack. Added the support for contrai HA and git tree. Change-Id: I29c5514ba8cbe2a0c6dd1ce4d2b19784b05ac282 Author: Narinder Gupta <narinder.gupta@canonical.com>
-rwxr-xr-xci/opencontrail/01-deploybundle.sh57
-rw-r--r--ci/opencontrail/juju-deployer/contrail-ha.yaml254
-rw-r--r--ci/opencontrail/juju-deployer/contrail-tip.yaml216
-rw-r--r--ci/opencontrail/juju-deployer/contrail.yaml199
4 files changed, 496 insertions, 230 deletions
diff --git a/ci/opencontrail/01-deploybundle.sh b/ci/opencontrail/01-deploybundle.sh
index 21235cb3..06c65792 100755
--- a/ci/opencontrail/01-deploybundle.sh
+++ b/ci/opencontrail/01-deploybundle.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-#!/bin/bash
#placeholder for deployment script.
set -ex
@@ -12,6 +11,8 @@ case "$1" in
;;
'tip' )
cp opencontrail/juju-deployer/contrail-tip.yaml ./bundles.yaml
+ cp opencontrail/juju-deployer/source/* ./
+ sed -i -- "s|branch: master|branch: stable/$2|g" ./*.yaml
;;
* )
cp opencontrail/juju-deployer/contrail.yaml ./bundles.yaml
@@ -20,31 +21,61 @@ esac
case "$3" in
'orangepod2' )
- sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml
- ;;
- 'intelpod5' )
- sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml
- ;;
- 'intelpod6' )
- sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml
+ cp maas/orange/pod2/control-interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host
+ cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces
+ cp maas/orange/pod2/compute-interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host
+ cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces
+ # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
+ sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml
+ # choose the correct interface to use for data network
+ sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml
+ # Choose the external port to go out from gateway to use.
+ sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml
+ ;;
+ 'intelpod6' )
+ cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host
+ cp maas/intel/pod6/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces
+ cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host
+ cp maas/intel/pod6/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces
+ # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
+ sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml
+ # choose the correct interface to use for data network
+ sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
+ # Choose the external port to go out from gateway to use.
+ sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml
+ ;;
+ 'intelpod5' )
+ cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host
+ cp maas/intel/pod5/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces
+ cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host
+ cp maas/intel/pod5/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces
+ # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
+ sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml
+ # choose the correct interface to use for data network
+ sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
+ # Choose the external port to go out from gateway to use.
+ sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.724"/g' ./bundles.yaml
;;
esac
echo "... Deployment Started ...."
case "$1" in
'nonha' )
- juju-deployer -vW -d -c bundles.yaml trusty-"$2"-contrail
+ juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
+ juju-deployer -vW -d -c bundles.yaml trusty-"$2"
;;
'ha' )
- juju-deployer -vW -d -c bundles.yaml openstack-phase1
+ juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
+ juju-deployer -vW -d -c bundles.yaml trusty-"$2"
;;
'tip' )
- juju-deployer -vW -d -c bundles.yaml trusty-"$2"-contrail
+ juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
+ juju-deployer -vW -d -c bundles.yaml trusty-"$2"
;;
* )
- juju-deployer -vW -d -c bundles.yaml trusty-"$2"-contrail
+ juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
+ juju-deployer -vW -d -c bundles.yaml trusty-"$2"
;;
esac
echo "... Deployment finished ...."
-
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index 7ca3471d..3da5a823 100644
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@ -1,38 +1,144 @@
-openstack:
+# vim: set ts=2 et:
+openstack-phase1:
+ series: trusty
services:
- mysql:
- constraints: mem=1G
+ nodes-api:
+ charm: "local:trusty/ubuntu-nodes-controller"
+ num_units: 3
+ constraints: tags=control
+ nodes-compute:
+ charm: "local:trusty/ubuntu-nodes-compute"
+ num_units: 1
+ constraints: tags=compute
+ "ntp":
+ charm: "cs:trusty/ntp"
+ relations:
+ - - "ntp:juju-info"
+ - "nodes-api:juju-info"
+ - - "ntp:juju-info"
+ - "nodes-compute:juju-info"
+openstack-phase2:
+ inherits: openstack-phase1
+ services:
+ "percona-cluster":
+ charm: "cs:trusty/percona-cluster"
+ num_units: 3
+ options:
+ "dataset-size": 2G
+ "lp1366997-workaround": true
+ "max-connections": 10000
+ "root-password": 293rhc395m
+ "sst-password": 127rc14t51
+ vip: 10.4.1.15
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
+ "hacluster-keystone":
+ charm: "cs:trusty/hacluster"
options:
- dataset-size: 50%
- rabbitmq-server:
- constraints: mem=1G
- keystone:
- branch: lp:~openstack-charmers/charms/trusty/keystone/next
- constraints: mem=1G
+ corosync_key: |
+ 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
+ "hacluster-horizon":
+ charm: "cs:trusty/hacluster"
options:
- admin-password: password
- openstack-dashboard:
- branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
- constraints: mem=1G
- nova-compute:
- branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
- constraints: mem=4G root-disk=20G
+ corosync_key: |
+ 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
+ "hacluster-nova":
+ charm: "cs:trusty/hacluster"
+ options:
+ corosync_key: |
+ 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
+ "hacluster-neutron":
+ charm: "cs:trusty/hacluster"
options:
- manage-neutron-plugin-legacy-mode: false
- nova-cloud-controller:
- branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
- constraints: mem=1G
+ corosync_key: |
+ 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
+ "hacluster-glance":
+ charm: "cs:trusty/hacluster"
options:
- network-manager: Neutron
- glance:
- branch: lp:~openstack-charmers/charms/trusty/glance/next
- constraints: mem=1G
- neutron-api:
+ corosync_key: |
+ 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
+ "rabbitmq-server":
+ branch: lp:charms/trusty/rabbitmq-server
+ num_units: 3
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
+ "keystone":
+ branch: lp:charms/trusty/keystone
+ num_units: 3
+ options:
+ "admin-password": openstack
+ "admin-token": admin
+ vip: 10.4.1.13
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
+ "openstack-dashboard":
+ branch: lp:charms/trusty/openstack-dashboard
+ num_units: 3
+ options:
+ secret: admin
+ vip: 10.4.1.11
+ webroot: /
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
+ "nova-compute":
+ branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+ num_units: 1
+ options:
+ "enable-live-migration": False
+ "manage-neutron-plugin-legacy-mode": False
+ to:
+ - "nodes-compute=0"
+# - "nodes-compute=1"
+# - "nodes-api=0"
+# - "nodes-api=1"
+# - "nodes-api=2"
+ "nova-cloud-controller":
+ branch: lp:charms/trusty/nova-cloud-controller
+ num_units: 3
+ options:
+ "console-access-protocol": novnc
+ "network-manager": Neutron
+ "quantum-security-groups": "yes"
+ "service-guard": true
+ vip: 10.4.1.16
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
+ "neutron-api":
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
- constraints: mem=1G
+ num_units: 3
options:
- manage-neutron-plugin-legacy-mode: false
+ neutron-security-groups: True
+ manage-neutron-plugin-legacy-mode: False
+ vip: 10.4.1.17
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
+ "glance":
+ branch: lp:charms/trusty/glance
+ num_units: 3
+ options:
+ vip: 10.4.1.12
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
relations:
+ - [ "glance:ha", "hacluster-glance:ha" ]
+ - [ "keystone:ha", "hacluster-keystone:ha" ]
+ - [ "neutron-api:ha", "hacluster-neutron:ha" ]
+ - [ "nova-cloud-controller:ha", "hacluster-nova:ha" ]
+ - [ "openstack-dashboard:ha", "hacluster-horizon:ha" ]
- [ keystone, mysql ]
- [ nova-cloud-controller, mysql ]
- [ nova-cloud-controller, rabbitmq-server ]
@@ -55,44 +161,63 @@ contrail:
services:
cassandra:
branch: lp:~stub/charms/trusty/cassandra/noauthentication
- constraints: mem=8G root-disk=20G
+ num_units: 3
options:
authenticator: AllowAllAuthenticator
- units: 3
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
zookeeper:
branch: lp:~charmers/charms/precise/zookeeper/trunk
+ num_units: 3
series: precise
- constraints: mem=1G
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
units: 3
contrail-configuration:
branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk
- constraints: mem=4G
+ num_units: 2
options:
- vip: x.x.x.x
- units: 2
+ vip: 10.4.1.18
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
contrail-control:
branch: lp:~sdn-charmers/charms/trusty/contrail-control/trunk
- constraints: mem=2G
- units: 2
+ num_units: 2
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
contrail-analytics:
branch: lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk
- constraints: mem=4G
- units: 2
+ num_units: 2
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
contrail-webui:
branch: lp:~sdn-charmers/charms/trusty/contrail-webui/trunk
- units: 2
+ num_units: 2
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
neutron-api-contrail:
branch: lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk
neutron-contrail:
branch: lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk
haproxy:
+ num_units: 2
options:
peering_mode: active-active
- units: 2
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
keepalived:
branch: lp:~sdn-charmers/charms/trusty/keepalived/trunk
options:
- virtual-ip: x.x.x.x
+ virtual-ip: 10.4.1.19
overrides:
admin-role: admin
relations:
@@ -120,25 +245,62 @@ contrail:
- [ contrail-analytics, haproxy ]
- [ contrail-webui, haproxy ]
- [ haproxy, keepalived ]
-trusty-icehouse-contrail:
+trusty-liberty-nodes:
+ inherits: openstack-phase1
+ series: trusty
+ overrides:
+ series: trusty
+
+trusty-liberty:
+ inherits: contrail
+ series: trusty
+ services:
+ mysql:
+ charm: cs:trusty/mysql
+ rabbitmq-server:
+ charm: cs:trusty/rabbitmq-server
+ overrides:
+ series: trusty
+ #os-data-network: 10.4.8.0/21
+ region: Canonical
+ openstack-origin: cloud:trusty-liberty
+
+trusty-kilo-nodes:
+ inherits: openstack-phase1
+ series: trusty
+ overrides:
+ series: trusty
+
+trusty-kilo:
inherits: contrail
series: trusty
services:
- haproxy:
- charm: cs:trusty/haproxy
mysql:
charm: cs:trusty/mysql
rabbitmq-server:
charm: cs:trusty/rabbitmq-server
-trusty-juno-contrail:
+ overrides:
+ series: trusty
+ #os-data-network: 10.4.8.0/21
+ region: Canonical
+ openstack-origin: cloud:trusty-kilo
+
+trusty-juno-nodes:
+ inherits: openstack-phase1
+ overrides:
+ series: trusty
+
+trusty-juno:
inherits: contrail
series: trusty
services:
- haproxy:
- charm: cs:trusty/haproxy
mysql:
charm: cs:trusty/mysql
rabbitmq-server:
charm: cs:trusty/rabbitmq-server
overrides:
+ series: trusty
+ #os-data-network: 10.4.8.0/21
+ region: Canonical
openstack-origin: cloud:trusty-juno
+
diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml
index d978c599..be0ca99c 100644
--- a/ci/opencontrail/juju-deployer/contrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml
@@ -1,40 +1,87 @@
-openstack:
+# vim: set ts=2 et:
+openstack-phase1:
+ series: trusty
services:
- mysql:
- constraints: mem=1G
+ nodes-api:
+ charm: "local:trusty/ubuntu-nodes-controller"
+ num_units: 1
+ constraints: tags=control
+ nodes-compute:
+ charm: "local:trusty/ubuntu-nodes-compute"
+ num_units: 1
+ constraints: tags=compute
+ "ntp":
+ charm: "cs:trusty/ntp"
+ relations:
+ - - "ntp:juju-info"
+ - "nodes-api:juju-info"
+ - - "ntp:juju-info"
+ - "nodes-compute:juju-info"
+openstack-phase2:
+ inherits: openstack-phase1
+ services:
+ "mysql":
+ charm: "cs:trusty/mysql"
+ num_units: 1
options:
- dataset-size: 50%
- rabbitmq-server:
- constraints: mem=1G
- keystone:
- branch: lp:~openstack-charmers/charms/trusty/keystone/next
- constraints: mem=1G
+ "dataset-size": 2G
+ "max-connections": 10000
+ to:
+ - "lxc:nodes-api=0"
+ "rabbitmq-server":
+ branch: lp:charms/trusty/rabbitmq-server
+ num_units: 1
+ to:
+ - "lxc:nodes-api=0"
+ "keystone":
+ branch: lp:charms/trusty/keystone
+ num_units: 1
+ options:
+ openstack-origin-git: include-file://keystone-master.yaml
+ "admin-password": openstack
+ "admin-token": admin
+ to:
+ - "lxc:nodes-api=0"
+ "openstack-dashboard":
+ branch: lp:charms/trusty/openstack-dashboard
+ num_units: 1
options:
- admin-password: password
- openstack-dashboard:
- branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
- constraints: mem=1G
- nova-compute:
+ openstack-origin-git: include-file://horizon-master.yaml
+ secret: admin
+ webroot: /
+ to:
+ - "lxc:nodes-api=0"
+ "nova-compute":
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
- constraints: mem=4G root-disk=20G
+ num_units: 1
options:
- manage-neutron-plugin-legacy-mode: false
- nova-cloud-controller:
- branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
- constraints: mem=1G
+ openstack-origin-git: include-file://nova-master.yaml
+ "manage-neutron-plugin-legacy-mode": False
+ to:
+ - "nodes-compute=0"
+# - "nodes-compute=1"
+ "nova-cloud-controller":
+ branch: lp:charms/trusty/nova-cloud-controller
+ num_units: 1
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
- constraints: mem=1G
+ openstack-origin-git: include-file://nova-master.yaml
+ "network-manager": Neutron
+ to:
+ - "lxc:nodes-api=0"
+ "neutron-api":
+ branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+ num_units: 1
options:
- manage-neutron-plugin-legacy-mode: false
+ manage-neutron-plugin-legacy-mode: False
+ to:
+ - "lxc:nodes-api=0"
+ "glance":
+ branch: lp:charms/trusty/glance
+ num_units: 1
+ options:
+ openstack-origin-git: include-file://glance-master.yaml
+ to:
+ - "lxc:nodes-api=0"
relations:
- [ keystone, mysql ]
- [ nova-cloud-controller, mysql ]
@@ -47,9 +94,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 ]
@@ -57,59 +101,50 @@ openstack:
- [ neutron-api, keystone ]
- [ neutron-api, neutron-api-contrail ]
contrail:
- inherits: openstack
+ inherits: openstack-phase2
services:
- cassandra:
- branch: lp:~sdn-charmers/charms/precise/cassandra/forced-install
- series: precise
- constraints: mem=8G root-disk=20G
- 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
- contrail-configuration:
- branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk
- constraints: mem=4G
+ to:
+ - "lxc:nodes-api=0"
+ cassandra:
+ branch: lp:~stub/charms/trusty/cassandra/noauthentication
+ to:
+ - "lxc:nodes-api=0"
options:
- vip: x.x.x.x
- units: 2
+ authenticator: AllowAllAuthenticator
+ contrail-configuration:
+ branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk
+ to:
+ - "lxc:nodes-api=0"
contrail-control:
branch: lp:~sdn-charmers/charms/trusty/contrail-control/trunk
- constraints: mem=2G
- units: 2
+ to:
+ - "lxc:nodes-api=0"
contrail-analytics:
branch: lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk
- constraints: mem=4G
- units: 2
+ to:
+ - "lxc:nodes-api=0"
contrail-webui:
branch: lp:~sdn-charmers/charms/trusty/contrail-webui/trunk
- units: 2
+ to:
+ - "lxc:nodes-api=0"
neutron-api-contrail:
branch: lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk
neutron-contrail:
branch: lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk
- haproxy:
- options:
- peering_mode: active-active
- units: 2
- keepalived:
- branch: lp:~sdn-charmers/charms/trusty/keepalived/trunk
- options:
- virtual-ip: x.x.x.x
- overrides:
- admin-role: admin
relations:
- [ "contrail-configuration:cassandra", "cassandra:database" ]
- [ 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,32 +153,65 @@ 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 ]
- - [ contrail-analytics, haproxy ]
- - [ contrail-webui, haproxy ]
- - [ haproxy, keepalived ]
-trusty-icehouse-contrail:
+
+trusty-liberty-nodes:
+ inherits: openstack-phase1
+ series: trusty
+ overrides:
+ series: trusty
+
+trusty-liberty:
+ inherits: contrail
+ series: trusty
+ services:
+ mysql:
+ charm: cs:trusty/mysql
+ rabbitmq-server:
+ charm: cs:trusty/rabbitmq-server
+ overrides:
+ series: trusty
+ #os-data-network: 10.4.8.0/21
+ region: Canonical
+ openstack-origin: cloud:trusty-liberty
+
+trusty-kilo-nodes:
+ inherits: openstack-phase1
+ series: trusty
+ overrides:
+ series: trusty
+
+trusty-kilo:
inherits: contrail
series: trusty
services:
- haproxy:
- charm: cs:trusty/haproxy
mysql:
charm: cs:trusty/mysql
rabbitmq-server:
charm: cs:trusty/rabbitmq-server
-trusty-juno-contrail:
+ overrides:
+ series: trusty
+ #os-data-network: 10.4.8.0/21
+ region: Canonical
+ openstack-origin: cloud:trusty-kilo
+
+trusty-juno-nodes:
+ inherits: openstack-phase1
+ overrides:
+ series: trusty
+
+trusty-juno:
inherits: contrail
series: trusty
services:
- haproxy:
- charm: cs:trusty/haproxy
mysql:
charm: cs:trusty/mysql
rabbitmq-server:
charm: cs:trusty/rabbitmq-server
overrides:
+ series: trusty
+ #os-data-network: 10.4.8.0/21
+ region: Canonical
openstack-origin: cloud:trusty-juno
+
diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml
index 2f1d29c0..99bb48ad 100644
--- a/ci/opencontrail/juju-deployer/contrail.yaml
+++ b/ci/opencontrail/juju-deployer/contrail.yaml
@@ -1,74 +1,81 @@
-openstack:
+# vim: set ts=2 et:
+openstack-phase1:
+ series: trusty
services:
- ubuntu:
- branch: "lp:charms/trusty/ubuntu"
+ nodes-api:
+ charm: "local:trusty/ubuntu-nodes-controller"
+ num_units: 1
constraints: tags=control
+ nodes-compute:
+ charm: "local:trusty/ubuntu-nodes-compute"
num_units: 1
- ubuntu-compute:
- branch: "lp:charms/trusty/ubuntu"
constraints: tags=compute
+ "ntp":
+ charm: "cs:trusty/ntp"
+ relations:
+ - - "ntp:juju-info"
+ - "nodes-api:juju-info"
+ - - "ntp:juju-info"
+ - "nodes-compute:juju-info"
+openstack-phase2:
+ inherits: openstack-phase1
+ services:
+ "mysql":
+ charm: "cs:trusty/mysql"
num_units: 1
- mysql:
- constraints: mem=1G
options:
- dataset-size: 50%
- max-connections: 20000
+ "dataset-size": 2G
+ "max-connections": 10000
to:
- - "lxc:ubuntu=0"
-
- rabbitmq-server:
- constraints: mem=1G
+ - "lxc:nodes-api=0"
+ "rabbitmq-server":
+ branch: lp:charms/trusty/rabbitmq-server
+ num_units: 1
to:
- - "lxc:ubuntu=0"
-
- keystone:
- branch: lp:~openstack-charmers/charms/trusty/keystone/next
- constraints: mem=1G
+ - "lxc:nodes-api=0"
+ "keystone":
+ branch: lp:charms/trusty/keystone
+ num_units: 1
options:
- admin-password: openstack
- admin-role: admin
+ "admin-password": openstack
+ "admin-token": admin
to:
- - "lxc:ubuntu=0"
-
- openstack-dashboard:
- branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
- constraints: mem=1G
+ - "lxc:nodes-api=0"
+ "openstack-dashboard":
+ branch: lp:charms/trusty/openstack-dashboard
+ num_units: 1
+ options:
+ secret: admin
+ webroot: /
to:
- - "lxc:ubuntu=0"
-
- nova-compute:
+ - "lxc:nodes-api=0"
+ "nova-compute":
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
- constraints: tags=compute
num_units: 1
- to:
- - "ubuntu-compute=0"
options:
- manage-neutron-plugin-legacy-mode: false
- nova-cloud-controller:
- branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
- constraints: mem=1G
+ "manage-neutron-plugin-legacy-mode": False
+ to:
+ - "nodes-compute=0"
+# - "nodes-compute=1"
+ "nova-cloud-controller":
+ branch: lp:charms/trusty/nova-cloud-controller
+ num_units: 1
options:
- network-manager: Neutron
+ "network-manager": Neutron
to:
- - "lxc:ubuntu=0"
-
-# neutron-gateway:
-# branch: lp:~sdn-charmers/charms/trusty/quantum-gateway/contrail
-# constraints: tags=virtual
-
- glance:
- branch: lp:~openstack-charmers/charms/trusty/glance/next
- constraints: mem=1G
+ - "lxc:nodes-api=0"
+ "neutron-api":
+ branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+ num_units: 1
+ options:
+ manage-neutron-plugin-legacy-mode: False
to:
- - "lxc:ubuntu=0"
-
- neutron-api:
- branch: lp:~openstack-charmers/charms/trusty/neutron-api/vpp
-# constraints: tags=virtual
+ - "lxc:nodes-api=0"
+ "glance":
+ branch: lp:charms/trusty/glance
+ num_units: 1
to:
- - "lxc:ubuntu=0"
- options:
- manage-neutron-plugin-legacy-mode: false
+ - "lxc:nodes-api=0"
relations:
- [ keystone, mysql ]
- [ nova-cloud-controller, mysql ]
@@ -87,52 +94,40 @@ openstack:
- [ neutron-api, nova-cloud-controller ]
- [ neutron-api, keystone ]
- [ neutron-api, neutron-api-contrail ]
-
contrail:
- inherits: openstack
+ inherits: openstack-phase2
services:
+ zookeeper:
+ branch: lp:~charmers/charms/precise/zookeeper/trunk
+ series: precise
+ to:
+ - "lxc:nodes-api=0"
cassandra:
branch: lp:~stub/charms/trusty/cassandra/noauthentication
to:
- - "lxc:ubuntu=0"
+ - "lxc:nodes-api=0"
options:
authenticator: AllowAllAuthenticator
-
- zookeeper:
- branch: lp:~charmers/charms/precise/zookeeper/trunk
- series: precise
- to:
- - "lxc:ubuntu=0"
-
contrail-configuration:
branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk
to:
- - "lxc:ubuntu=0"
-# options:
-# floating-ip-pools: "[ { project: admin, network: public, pool-name: floatingip_pool, target-projects: [ admin ] } ]"
-
+ - "lxc:nodes-api=0"
contrail-control:
branch: lp:~sdn-charmers/charms/trusty/contrail-control/trunk
to:
- - "lxc:ubuntu=0"
-
+ - "lxc:nodes-api=0"
contrail-analytics:
branch: lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk
to:
- - "lxc:ubuntu=0"
-
+ - "lxc:nodes-api=0"
contrail-webui:
branch: lp:~sdn-charmers/charms/trusty/contrail-webui/trunk
to:
- - "lxc:ubuntu=0"
-
+ - "lxc:nodes-api=0"
neutron-api-contrail:
branch: lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk
neutron-contrail:
branch: lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk
-
- overrides:
- admin-role: admin
relations:
- [ "contrail-configuration:cassandra", "cassandra:database" ]
- [ contrail-configuration, zookeeper ]
@@ -155,17 +150,13 @@ contrail:
- [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ]
- [ neutron-contrail, keystone ]
-precise-icehouse-contrail:
- inherits: contrail
- series: precise
- services:
- mysql:
- charm: cs:precise/mysql
- rabbitmq-server:
- charm: cs:precise/rabbitmq-server
+trusty-liberty-nodes:
+ inherits: openstack-phase1
+ series: trusty
overrides:
- openstack-origin: cloud:precise-icehouse
-trusty-icehouse-contrail:
+ series: trusty
+
+trusty-liberty:
inherits: contrail
series: trusty
services:
@@ -173,17 +164,19 @@ trusty-icehouse-contrail:
charm: cs:trusty/mysql
rabbitmq-server:
charm: cs:trusty/rabbitmq-server
-trusty-juno-contrail:
- inherits: contrail
+ overrides:
+ series: trusty
+ #os-data-network: 10.4.8.0/21
+ region: Canonical
+ openstack-origin: cloud:trusty-liberty
+
+trusty-kilo-nodes:
+ inherits: openstack-phase1
series: trusty
- services:
- mysql:
- charm: cs:trusty/mysql
- rabbitmq-server:
- charm: cs:trusty/rabbitmq-server
overrides:
- openstack-origin: cloud:trusty-juno
-trusty-kilo-contrail:
+ series: trusty
+
+trusty-kilo:
inherits: contrail
series: trusty
services:
@@ -192,8 +185,17 @@ trusty-kilo-contrail:
rabbitmq-server:
charm: cs:trusty/rabbitmq-server
overrides:
+ series: trusty
+ #os-data-network: 10.4.8.0/21
+ region: Canonical
openstack-origin: cloud:trusty-kilo
-trusty-liberty-contrail:
+
+trusty-juno-nodes:
+ inherits: openstack-phase1
+ overrides:
+ series: trusty
+
+trusty-juno:
inherits: contrail
series: trusty
services:
@@ -202,5 +204,8 @@ trusty-liberty-contrail:
rabbitmq-server:
charm: cs:trusty/rabbitmq-server
overrides:
- openstack-origin: cloud:trusty-liberty
+ series: trusty
+ #os-data-network: 10.4.8.0/21
+ region: Canonical
+ openstack-origin: cloud:trusty-juno