summaryrefslogtreecommitdiffstats
path: root/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml')
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml67
1 files changed, 35 insertions, 32 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 4740a676..f22bd535 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -21,40 +21,40 @@ openstack-phase2:
inherits: openstack-phase1
services:
ceilometer:
- charm: cs:trusty/ceilometer
+ branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
num_units: 3
to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
ceilometer-agent:
- charm: cs:trusty/ceilometer-agent
+ branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
ceph:
- charm: cs:trusty/ceph
- num_units: 2
+ branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
+ num_units: 3
options:
- monitor-count: 1
+ monitor-count: 3
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: /srv
- osd-reformat: 'yes'
+ osd-devices: ""
+# osd-reformat: 'yes'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
- - "nodes-compute=0"
- - "nodes-compute=1"
+ - "lxc:nodes-api=2"
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
ceph-osd:
- charm: cs:trusty/ceph-osd
- num_units: 3
+ branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
+ num_units: 2
options:
osd-devices: /srv
osd-reformat: 'yes'
to:
- - "nodes-api=0"
- - "nodes-api=1"
- - "nodes-api=2"
+ - "nodes-compute=0"
+ - "nodes-compute=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
@@ -62,7 +62,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
@@ -73,10 +73,10 @@ openstack-phase2:
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
cinder-ceph:
- charm: cs:trusty/cinder-ceph
+ branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
num_units: 0
glance:
- charm: cs:trusty/glance
+ branch: "lp:~openstack-charmers/charms/trusty/glance/next"
num_units: 3
options:
ha-mcastport: 5402
@@ -91,7 +91,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=2"
keystone:
- charm: cs:trusty/keystone
+ branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
num_units: 3
options:
admin-password: openstack
@@ -121,7 +121,7 @@ openstack-phase2:
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
neutron-api:
- charm: cs:trusty/neutron-api
+ branch: "lp:~openstack-charmers/charms/trusty/neutron-api/next"
num_units: 3
options:
neutron-security-groups: true
@@ -131,7 +131,7 @@ openstack-phase2:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
neutron-gateway:
- charm: cs:trusty/neutron-gateway
+ branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
num_units: 1
options:
# "ext-port": "eth1"
@@ -139,10 +139,10 @@ openstack-phase2:
to:
- "nodes-api=0"
neutron-openvswitch:
- charm: cs:trusty/neutron-openvswitch
+ branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
num_units: 0
nova-cloud-controller:
- charm: cs:trusty/nova-cloud-controller
+ branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
num_units: 3
options:
network-manager: Neutron
@@ -154,7 +154,7 @@ openstack-phase2:
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
nova-compute:
- charm: cs:trusty/nova-compute
+ branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next"
num_units: 2
options:
enable-live-migration: true
@@ -168,7 +168,7 @@ openstack-phase2:
# - "nodes-api=1"
# - "nodes-api=2"
openstack-dashboard:
- charm: cs:trusty/openstack-dashboard
+ branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
num_units: 3
options:
secret: admin
@@ -179,38 +179,38 @@ openstack-phase2:
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
rabbitmq-server:
- charm: cs:trusty/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"
heat:
- charm: cs:trusty/heat
+ branch: "lp:~openstack-charmers/charms/trusty/heat/next"
to:
- "lxc:nodes-api=0"
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
+ 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='
@@ -324,6 +324,7 @@ trusty-liberty:
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-liberty"
@@ -342,6 +343,7 @@ trusty-kilo:
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-kilo"
@@ -360,6 +362,7 @@ trusty-juno:
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-juno"