summaryrefslogtreecommitdiffstats
path: root/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml')
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml66
1 files changed, 36 insertions, 30 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 98d7ba7a..75f3cafd 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-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,37 +45,35 @@ 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
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: /srv
+ osd-devices: ""
monitor-count: 1
- osd-reformat: 'no'
+# osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
+ - "lxc:nodes-api=0"
+ ceph-osd:
+ charm: cs:trusty/ceph-osd
+ num_units: 1
+ options:
+ osd-devices: /srv
+ osd-reformat: 'yes'
+ to:
- "nodes-compute=0"
-# - "nodes-compute=1"
-# ceph-osd:
-# charm: cs:trusty/ceph-osd
-# num_units: 1
-# options:
-# osd-devices: /dev/sdb
-# osd-reformat: 'yes'
-# to:
-# - "lxc:nodes-api=0"
-# ceph-radosgw:
-# charm: cs:trusty/ceph-radosgw
-# num_units: 1
-# options:
-# use-embedded-webserver: true
-# to:
-
-# - "lxc:nodes-api=0"
+ ceph-radosgw:
+ charm: cs:trusty/ceph-radosgw
+ num_units: 1
+ options:
+ use-embedded-webserver: true
+ 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
@@ -85,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:
openstack-origin-git: include-file://keystone-master.yaml
@@ -101,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:
openstack-origin-git: include-file://horizon-master.yaml
@@ -119,7 +117,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 +135,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
instance-mtu: 1400
@@ -145,7 +143,7 @@ openstack-phase2:
to:
- "nodes-api=0"
"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
@@ -157,7 +155,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
neutron-openvswitch:
- branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/trunk
+ branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
options:
openstack-origin-git: include-file://neutron-master.yaml
relations:
@@ -241,6 +239,12 @@ openstack-phase2:
- "cinder-ceph:ceph"
- - "ceph:client"
- "glance:ceph"
+ - - "ceph-osd:mon"
+ - "ceph:osd"
+ - - "ceph-radosgw:mon"
+ - "ceph:radosgw"
+ - - "ceph-radosgw:identity-service"
+ - "keystone:identity-service"
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
@@ -250,6 +254,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"
@@ -271,6 +276,7 @@ trusty-kilo:
overrides:
region: Canonical
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
openstack-origin: cloud:trusty-kilo
source: cloud:trusty-kilo