summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornarindergupta <narinder.gupta@canonical.com>2015-10-28 23:40:36 -0500
committernarindergupta <narinder.gupta@canonical.com>2015-10-28 23:41:18 -0500
commit6b06703b036951bdf4a9d60bddb1c452668ebf6d (patch)
tree2104d2698a60cf545f0deae17b708fc90e28ec94
parent7a817ea24fa6b9aa90db5e0cfe24d624aac63388 (diff)
modified to do fast deployment of bundle which saves time.
Change-Id: I5c3bd59abb4c46d255031bf538f959fc919a4519
-rwxr-xr-xci/odl/01-deploybundle.sh22
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml216
-rw-r--r--ci/odl/juju-deployer/ovs-odl.yaml7
3 files changed, 147 insertions, 98 deletions
diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh
index 3de74fb3..87352666 100755
--- a/ci/odl/01-deploybundle.sh
+++ b/ci/odl/01-deploybundle.sh
@@ -8,7 +8,6 @@ case "$1" in
;;
'ha' )
cp odl/juju-deployer/ovs-odl-ha.yaml ./bundles.yaml
- juju-deployer -d -r 13 -c bundles.yaml openstack-phase1
;;
'tip' )
cp odl/juju-deployer/ovs-odl-tip.yaml ./bundles.yaml
@@ -31,8 +30,21 @@ case "$3" in
esac
echo "... Deployment Started ...."
-
-#case openstack kilo with odl
-juju-deployer -d -r 13 -c bundles.yaml trusty-"$2"
-
+case "$1" in
+ 'nonha' )
+ 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 openstack-phase3
+ juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+ ;;
+ 'tip' )
+ juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+ ;;
+ * )
+ juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+ ;;
+esac
echo "... Deployment finished ...."
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 62b2a046..e154cf9f 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -8,45 +8,10 @@ openstack-phase1:
constraints: tags=control
nodes-compute:
branch: "lp:charms/trusty/ubuntu"
- num_units: 1
+ num_units: 2
constraints: tags=compute
- neutron-gateway:
- branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
-# constraints: tags=gateway
- options:
-# "ext-port": eth1
- plugin: ovs-odl
-# instance-mtu: 1400
- to: nodes-api=0
"ntp":
charm: "cs:trusty/ntp"
- openvswitch-odl:
- branch: lp:~alai/charms/trusty/openvswitch-odl/trunk
- "hacluster-keystone":
- charm: "cs:trusty/hacluster"
- options:
- corosync_key: |
- 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
- "hacluster-horizon":
- charm: "cs:trusty/hacluster"
- options:
- 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:
- corosync_key: |
- 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
- "hacluster-glance":
- charm: "cs:trusty/hacluster"
- options:
- corosync_key: |
- 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
relations:
- - "ntp:juju-info"
- "nodes-api:juju-info"
@@ -54,17 +19,31 @@ openstack-phase1:
- "nodes-compute:juju-info"
openstack-phase2:
inherits: openstack-phase1
+# overrides:
services:
- "nova-compute":
- charm: "cs:trusty/nova-compute"
- num_units: 1
+ "percona-cluster":
+ charm: "cs:trusty/percona-cluster"
+ num_units: 3
options:
- "enable-live-migration": true
- "enable-resize": true
- "migration-auth-type": ssh
+ "dataset-size": 2G
+ "lp1366997-workaround": true
+ "max-connections": 10000
+ "root-password": 293rhc395m
+ "sst-password": 127rc14t51
+ vip: 10.4.1.15
to:
- - "nodes-compute=0"
-# - "nodes-compute=1"
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
+ "rabbitmq-server":
+ charm: "cs:trusty/rabbitmq-server"
+ num_units: 3
+ options:
+ management_plugin: true
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
"keystone":
charm: "cs:trusty/keystone"
num_units: 3
@@ -76,36 +55,30 @@ openstack-phase2:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
- "glance":
- charm: "cs:trusty/glance"
+ "openstack-dashboard":
+ charm: "cs:trusty/openstack-dashboard"
num_units: 3
options:
- vip: 10.4.1.12
+ secret: admin
+ vip: 10.4.1.11
+ webroot: /
to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
- "neutron-api":
- branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
- num_units: 3
- options:
- neutron-security-groups: False
- manage-neutron-plugin-legacy-mode: False
- vip: 10.4.1.17
- to:
- - "lxc:nodes-api=0"
- - "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
- neutron-api-odl:
- branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
- options:
- overlay-network-type: 'vxlan gre'
- security-groups: true
- odl-controller:
- branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
- options:
- install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
- to: lxc:nodes-api=1
+ "nova-compute":
+ charm: "cs:trusty/nova-compute"
+ num_units: 2
+ options:
+ "enable-live-migration": true
+ "enable-resize": true
+ "migration-auth-type": ssh
+ to:
+ - "nodes-compute=0"
+ - "nodes-compute=1"
+# - "nodes-api=0"
+# - "nodes-api=1"
+# - "nodes-api=2"
"nova-cloud-controller":
charm: "cs:trusty/nova-cloud-controller"
num_units: 3
@@ -119,40 +92,76 @@ openstack-phase2:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
- "openstack-dashboard":
- charm: "cs: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"
- "rabbitmq-server":
- charm: "cs:trusty/rabbitmq-server"
+ "neutron-api":
+ branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
num_units: 3
- options:
- management_plugin: true
- to:
+ options:
+ neutron-security-groups: False
+ manage-neutron-plugin-legacy-mode: False
+ vip: 10.4.1.17
+ to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
- "percona-cluster":
- charm: "cs:trusty/percona-cluster"
+ neutron-gateway:
+ branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
+# constraints: tags=gateway
+ options:
+# "ext-port": eth1
+ plugin: ovs-odl
+# instance-mtu: 1400
+ to: nodes-api=0
+ odl-controller:
+ branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
+ options:
+ install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
+ to: lxc:nodes-api=1
+ "glance":
+ charm: "cs:trusty/glance"
num_units: 3
options:
- "dataset-size": 2G
- "lp1366997-workaround": true
- "max-connections": 10000
- "root-password": 293rhc395m
- "sst-password": 127rc14t51
- vip: 10.4.1.15
+ vip: 10.4.1.12
to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
+ neutron-api-odl:
+ branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
+ options:
+ overlay-network-type: 'vxlan gre'
+ security-groups: true
+ openvswitch-odl:
+ branch: lp:~alai/charms/trusty/openvswitch-odl/trunk
+openstack-phase3:
+ inherits: openstack-phase2
+ overrides:
+ cluster_count: 3
+ services:
+ "hacluster-keystone":
+ charm: "cs:trusty/hacluster"
+ options:
+ corosync_key: |
+ 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
+ "hacluster-horizon":
+ charm: "cs:trusty/hacluster"
+ options:
+ 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:
+ corosync_key: |
+ 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
+ "hacluster-glance":
+ charm: "cs:trusty/hacluster"
+ options:
+ corosync_key: |
+ 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
relations:
- - "glance:ha"
- "hacluster-glance:ha"
@@ -164,6 +173,9 @@ openstack-phase2:
- "hacluster-nova:ha"
- - "openstack-dashboard:ha"
- "hacluster-horizon:ha"
+openstack-phase4:
+ inherits: openstack-phase3
+ relations:
- - "nova-compute:amqp"
- "rabbitmq-server:amqp"
- - "neutron-gateway:amqp"
@@ -214,16 +226,34 @@ openstack-phase2:
- "odl-controller:ovsdb-manager"
- - "neutron-api-odl:odl-controller"
- "odl-controller:controller-api"
-trusty-kilo:
+trusty-liberty-nodes:
+ inherits: openstack-phase2
+ overrides:
+# os-data-network: 10.6.1.0/24
+ region: Canonical
+ source: "cloud:trusty-liberty"
+ "openstack-origin": "cloud:trusty-liberty"
+ series: trusty
+
+trusty-liberty:
+ inherits: openstack-phase4
+
+trusty-kilo-nodes:
inherits: openstack-phase2
overrides:
+# os-data-network: 10.6.1.0/24
region: Canonical
source: "cloud:trusty-kilo"
"openstack-origin": "cloud:trusty-kilo"
series: trusty
+
+trusty-kilo:
+ inherits: openstack-phase4
+
trusty-juno:
inherits: openstack-phase2
overrides:
+# os-data-network: 10.6.1.0/24
region: Canonical
source: "cloud:trusty-juno"
"openstack-origin": "cloud:trusty-juno"
diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml
index b188a587..2ef0480b 100644
--- a/ci/odl/juju-deployer/ovs-odl.yaml
+++ b/ci/odl/juju-deployer/ovs-odl.yaml
@@ -92,13 +92,20 @@ openstack-services:
- ['glance:identity-service', 'keystone:identity-service']
- ['glance:amqp', 'rabbitmq-server:amqp']
- ['openstack-dashboard:identity-service','keystone:identity-service']
+trusty-liberty:
+ inherits: openstack-services
+ overrides:
+# os-data-network: 10.6.1.0/24
+ openstack-origin: cloud:trusty-liberty
trusty-kilo:
inherits: openstack-services
overrides:
+# os-data-network: 10.6.1.0/24
openstack-origin: cloud:trusty-kilo
trusty-juno:
inherits: openstack-services
overrides:
+# os-data-network: 10.6.1.0/24
openstack-origin: cloud:trusty-juno
trusty-icehouse:
inherits: openstack-services