summaryrefslogtreecommitdiffstats
path: root/ci/odl
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-01-16 23:40:03 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-01-16 23:41:13 -0600
commita14701ad782b38314165f6e2d9854d76aa97b95f (patch)
treefe976d35ff20d57095d44278afd0d313950c79d9 /ci/odl
parenta29eded73a4e7cda9e1d7b9f1edafe6e9a1ccb78 (diff)
updating to latest charm for keystone issue.
Change-Id: Id0c79254c1ad31fab60fee908b5d2bc42bc87b14
Diffstat (limited to 'ci/odl')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml60
1 files changed, 30 insertions, 30 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 7df2e426..4860799e 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -35,35 +35,35 @@ 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"
+ 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"
-# options:
-# corosync_key: |
-# 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
-# "hacluster-ceilometer":
-# charm: "cs:trusty/hacluster"
-# options:
-# corosync_key: |
-# 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
+ "hacluster-glance":
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+ options:
+ corosync_key: |
+ 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
+ "hacluster-ceilometer":
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+ options:
+ corosync_key: |
+ 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
"ceilometer":
branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
num_units: 3
@@ -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'
+ 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,16 +126,16 @@ 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
"rabbitmq-server":
- branch: lp:charms/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"
"keystone":
- branch: lp:charms/trusty/keystone
+ branch: lp:~openstack-charmers/charms/trusty/keystone/next
num_units: 3
options:
# ha-mcastport: 5402
@@ -147,7 +147,7 @@ openstack-phase2:
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
"openstack-dashboard":
- branch: lp:charms/trusty/openstack-dashboard
+ branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
num_units: 3
options:
secret: admin
@@ -170,7 +170,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: 3
options:
"console-access-protocol": novnc
@@ -194,7 +194,7 @@ openstack-phase2:
- "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
@@ -212,7 +212,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=1"
"glance":
- branch: lp:charms/trusty/glance
+ branch: lp:~openstack-charmers/charms/trusty/glance/next
num_units: 3
options:
vip: 10.4.1.12
@@ -234,8 +234,8 @@ openstack-phase2:
openvswitch-odl:
branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
relations:
-# - - "glance:ha"
-# - "hacluster-glance:ha"
+ - - "glance:ha"
+ - "hacluster-glance:ha"
- - "keystone:ha"
- "hacluster-keystone:ha"
- - "neutron-api:ha"
@@ -244,8 +244,8 @@ openstack-phase2:
- "hacluster-nova:ha"
- - "openstack-dashboard:ha"
- "hacluster-horizon:ha"
-# - - "ceilometer:ha"
-# - "hacluster-ceilometer:ha"
+ - - "ceilometer:ha"
+ - "hacluster-ceilometer:ha"
- - "neutron-api:neutron-plugin-api-subordinate"
- "neutron-api-odl:neutron-plugin-api-subordinate"
- - "nova-compute:neutron-plugin"