summaryrefslogtreecommitdiffstats
path: root/ci/odl/juju-deployer
diff options
context:
space:
mode:
Diffstat (limited to 'ci/odl/juju-deployer')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml96
-rw-r--r--ci/odl/juju-deployer/ovs-odl-nonha.yaml30
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml27
3 files changed, 77 insertions, 76 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 82efddd2..00ee8d2c 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -10,20 +10,20 @@ openstack-phase1:
charm: "cs:trusty/ubuntu"
num_units: 2
constraints: tags=compute
- "ntp":
+ "ntp":
charm: "cs:trusty/ntp"
relations:
- - "ntp:juju-info"
- "nodes-api:juju-info"
- - "ntp:juju-info"
- "nodes-compute:juju-info"
-openstack-phase2:
+openstack-phase2:
inherits: openstack-phase1
- services:
- "percona-cluster":
+ services:
+ "percona-cluster":
branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
num_units: 3
- options:
+ options:
"dataset-size": 2G
"lp1366997-workaround": true
"max-connections": 10000
@@ -35,32 +35,32 @@ openstack-phase2:
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
"hacluster-keystone":
- charm: "cs:trusty/hacluster"
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
"hacluster-horizon":
- charm: "cs:trusty/hacluster"
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
"hacluster-nova":
- charm: "cs:trusty/hacluster"
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
- "hacluster-neutron":
- charm: "cs:trusty/hacluster"
+ "hacluster-neutron":
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
"hacluster-glance":
- charm: "cs:trusty/hacluster"
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
"hacluster-ceilometer":
- charm: "cs:trusty/hacluster"
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
@@ -85,21 +85,21 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
ceph:
- charm: cs:trusty/ceph
+ branch: lp:~openstack-charmers/charms/trusty/ceph/next
num_units: 2
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
osd-devices: /srv
- monitor-count: 1
- osd-reformat: 'no'
+ monitor-count: 1
+ osd-reformat: 'false'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
- "nodes-compute=0"
- "nodes-compute=1"
ceph-osd:
- charm: cs:trusty/ceph-osd
+ branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next
num_units: 1
options:
osd-devices: /srv
@@ -107,7 +107,7 @@ openstack-phase2:
to:
- "nodes-api=1"
ceph-radosgw:
- charm: cs:trusty/ceph-radosgw
+ branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next
num_units: 1
options:
use-embedded-webserver: true
@@ -115,7 +115,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
cinder:
- charm: cs:trusty/cinder
+ branch: lp:~openstack-charmers/charms/trusty/cinder/next
num_units: 3
options:
block-device: None
@@ -126,18 +126,18 @@ openstack-phase2:
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
cinder-ceph:
- charm: cs:trusty/cinder-ceph
- "rabbitmq-server":
- branch: lp:charms/trusty/rabbitmq-server
+ branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next
+ "rabbitmq-server":
+ branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
num_units: 3
to:
- "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "keystone":
- branch: lp:charms/trusty/keystone
+ "keystone":
+ branch: lp:~openstack-charmers/charms/trusty/keystone/next
num_units: 3
- options:
+ options:
# ha-mcastport: 5402
"admin-password": openstack
"admin-token": admin
@@ -146,10 +146,10 @@ openstack-phase2:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
- "openstack-dashboard":
- branch: lp:charms/trusty/openstack-dashboard
+ "openstack-dashboard":
+ branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
num_units: 3
- options:
+ options:
secret: admin
vip: 10.4.1.11
webroot: /
@@ -157,10 +157,10 @@ openstack-phase2:
- "lxc:nodes-api=1"
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
- "nova-compute":
+ "nova-compute":
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
num_units: 2
- options:
+ options:
"enable-live-migration": False
"manage-neutron-plugin-legacy-mode": False
to:
@@ -169,52 +169,53 @@ openstack-phase2:
# - "nodes-api=0"
# - "nodes-api=1"
# - "nodes-api=2"
- "nova-cloud-controller":
- branch: lp:charms/trusty/nova-cloud-controller
+ "nova-cloud-controller":
+ branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
num_units: 3
- options:
+ options:
"console-access-protocol": novnc
"network-manager": Neutron
"quantum-security-groups": "yes"
"service-guard": true
+ "neutron-external-network": ext_net
vip: 10.4.1.16
to:
- "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "neutron-api":
+ "neutron-api":
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
num_units: 3
options:
neutron-security-groups: True
manage-neutron-plugin-legacy-mode: False
vip: 10.4.1.17
- to:
+ to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
neutron-gateway:
- branch: lp:charms/trusty/neutron-gateway
+ branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
options:
# "ext-port": "eth1"
plugin: ovs-odl
instance-mtu: 1400
- to:
+ to:
- "nodes-api=0"
odl-controller:
branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
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"
-# install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz"
+ #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"
+ install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz"
+ profile: "openvswitch-odl-lithium"
http-proxy: "http://squid.internal:3128"
https-proxy: "http://squid.internal:3128"
-
- to:
+ to:
- "lxc:nodes-api=1"
- "glance":
- branch: lp:charms/trusty/glance
+ "glance":
+ branch: lp:~openstack-charmers/charms/trusty/glance/next
num_units: 3
- options:
+ options:
vip: 10.4.1.12
# ha-mcastport: 5402
to:
@@ -227,7 +228,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=2"
neutron-api-odl:
- branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
+ branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
options:
overlay-network-type: 'vxlan gre'
security-groups: True
@@ -345,7 +346,7 @@ trusty-liberty-nodes:
trusty-liberty:
inherits: openstack-phase2
overrides:
- cluster_count: 3
+# cluster_count: 3
#os-data-network: 10.4.8.0/21
#prefer-ipv6: true
region: Canonical
@@ -364,7 +365,7 @@ trusty-kilo-nodes:
trusty-kilo:
inherits: openstack-phase2
overrides:
- cluster_count: 3
+# cluster_count: 3
#os-data-network: 10.4.8.0/21
#prefer-ipv6: true
region: Canonical
@@ -383,7 +384,7 @@ trusty-juno-nodes:
trusty-juno:
inherits: openstack-phase2
overrides:
- cluster_count: 3
+# cluster_count: 3
#os-data-network: 10.4.8.0/21
#prefer-ipv6: true
region: Canonical
@@ -393,4 +394,3 @@ trusty-juno:
ceph-osd-replication-count: 2
admin-role: admin
keystone-admin-role: admin
-
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 3511c929..7ee1e292 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -21,7 +21,7 @@ openstack-phase2:
inherits: openstack-phase1
services:
"mysql":
- charm: "cs:trusty/mysql"
+ branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
num_units: 1
options:
"dataset-size": 2G
@@ -45,7 +45,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
ceph:
- charm: cs:trusty/ceph
+ branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
num_units: 1
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
@@ -74,7 +74,7 @@ openstack-phase2:
# to:
# - "lxc:nodes-api=0"
cinder:
- charm: cs:trusty/cinder
+ branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
num_units: 1
options:
block-device: None
@@ -83,14 +83,14 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
cinder-ceph:
- charm: cs:trusty/cinder-ceph
+ branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
"rabbitmq-server":
- branch: lp:charms/trusty/rabbitmq-server
+ branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
num_units: 1
to:
- "lxc:nodes-api=0"
"keystone":
- branch: lp:charms/trusty/keystone
+ branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
num_units: 1
options:
# ha-mcastport: 5402
@@ -99,7 +99,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
"openstack-dashboard":
- branch: lp:charms/trusty/openstack-dashboard
+ branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
num_units: 1
options:
secret: admin
@@ -119,7 +119,7 @@ openstack-phase2:
# - "nodes-api=1"
# - "nodes-api=2"
"nova-cloud-controller":
- branch: lp:charms/trusty/nova-cloud-controller
+ branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
num_units: 1
options:
"console-access-protocol": novnc
@@ -136,7 +136,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
neutron-gateway:
- branch: lp:charms/trusty/neutron-gateway
+ branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
options:
# "ext-port": "eth1"
plugin: ovs-odl
@@ -146,15 +146,15 @@ openstack-phase2:
odl-controller:
branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
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"
- #install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz"
+ #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"
+ install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz"
+ profile: "openvswitch-odl-lithium"
http-proxy: "http://squid.internal:3128"
https-proxy: "http://squid.internal:3128"
-
- to:
- - "lxc:nodes-api=0"
+ to:
+ - "lxc:nodes-api=1"
"glance":
- branch: lp:charms/trusty/glance
+ branch: lp:~openstack-charmers/charms/trusty/glance/next
num_units: 1
to:
- "lxc:nodes-api=0"
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 341f59ac..db41fd75 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -21,7 +21,7 @@ openstack-phase2:
inherits: openstack-phase1
services:
"mysql":
- charm: "cs:trusty/mysql"
+ branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
num_units: 1
options:
"dataset-size": 2G
@@ -45,7 +45,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
ceph:
- charm: cs:trusty/ceph
+ branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
num_units: 1
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
@@ -75,7 +75,7 @@ openstack-phase2:
# - "lxc:nodes-api=0"
cinder:
- charm: cs:trusty/cinder
+ branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
num_units: 1
options:
block-device: None
@@ -85,14 +85,14 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
cinder-ceph:
- charm: cs:trusty/cinder-ceph
+ branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
"rabbitmq-server":
- branch: lp:charms/trusty/rabbitmq-server
+ branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
num_units: 1
to:
- "lxc:nodes-api=0"
"keystone":
- branch: lp:charms/trusty/keystone
+ branch: lp:~openstack-charmers/charms/trusty/keystone/next
num_units: 1
options:
openstack-origin-git: include-file://keystone-master.yaml
@@ -101,7 +101,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
"openstack-dashboard":
- branch: lp:charms/trusty/openstack-dashboard
+ branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
num_units: 1
options:
openstack-origin-git: include-file://horizon-master.yaml
@@ -119,7 +119,7 @@ openstack-phase2:
- "nodes-compute=0"
# - "nodes-compute=1"
"nova-cloud-controller":
- branch: lp:charms/trusty/nova-cloud-controller
+ branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
num_units: 1
options:
openstack-origin-git: include-file://nova-master.yaml
@@ -137,7 +137,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
neutron-gateway:
- branch: lp:charms/trusty/neutron-gateway
+ branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
options:
openstack-origin-git: include-file://neutron-master.yaml
# "ext-port": "eth1"
@@ -148,14 +148,15 @@ openstack-phase2:
odl-controller:
branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
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"
-# install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz"
+ #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"
+ install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz"
+ profile: "openvswitch-odl-lithium"
http-proxy: "http://squid.internal:3128"
https-proxy: "http://squid.internal:3128"
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
"glance":
- branch: lp:charms/trusty/glance
+ branch: lp:~openstack-charmers/charms/trusty/glance/next
num_units: 1
options:
openstack-origin-git: include-file://glance-master.yaml