summaryrefslogtreecommitdiffstats
path: root/ci/odl/juju-deployer/ovs-odl-tip.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/odl/juju-deployer/ovs-odl-tip.yaml')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml74
1 files changed, 68 insertions, 6 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 1b362d5d..0b880c91 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -20,7 +20,14 @@ openstack-phase1:
openstack-phase2:
inherits: openstack-phase1
services:
- services:
+ "mysql":
+ charm: "cs:trusty/mysql"
+ num_units: 1
+ options:
+ "dataset-size": 2G
+ "max-connections": 10000
+ to:
+ - "lxc:nodes-api=0"
"ceilometer":
branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
num_units: 1
@@ -33,18 +40,52 @@ openstack-phase2:
num_units: 1
to:
- "lxc:nodes-api=0"
- "heat"
+ "heat":
branch: "lp:~openstack-charmers/charms/trusty/heat/next"
to:
- "lxc:nodes-api=0"
- "mysql":
- charm: "cs:trusty/mysql"
+ ceph:
+ charm: cs:trusty/ceph
num_units: 1
options:
- "dataset-size": 2G
- "max-connections": 10000
+ fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
+ monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+ osd-devices: /srv
+ monitor-count: 1
+# 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"
+# 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"
+ cinder:
+ charm: cs:trusty/cinder
+ num_units: 1
+ options:
+ block-device: None
+ glance-api-version: 2
+# ha-mcastport: 5401
+# openstack-origin-git: include-file://cinder-master.yaml
to:
- "lxc:nodes-api=0"
+ cinder-ceph:
+ charm: cs:trusty/cinder-ceph
"rabbitmq-server":
branch: lp:charms/trusty/rabbitmq-server
num_units: 1
@@ -194,6 +235,24 @@ openstack-phase2:
- "keystone:identity-service"
- - "heat:amqp"
- "rabbitmq-server:amqp"
+ - - "cinder:image-service"
+ - "glance:image-service"
+ - - "cinder:amqp"
+ - "rabbitmq-server:amqp"
+ - - "cinder:identity-service"
+ - "keystone:identity-service"
+ - - "cinder:cinder-volume-service"
+ - "nova-cloud-controller:cinder-volume-service"
+ - - "cinder-ceph:storage-backend"
+ - "cinder:storage-backend"
+ - - "ceph:client"
+ - "nova-compute:ceph"
+ - - "cinder:shared-db"
+ - "mysql:shared-db"
+ - - "ceph:client"
+ - "cinder-ceph:ceph"
+ - - "ceph:client"
+ - "glance:ceph"
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
@@ -207,6 +266,7 @@ trusty-liberty:
source: "cloud:trusty-liberty"
"openstack-origin": "cloud:trusty-liberty"
series: trusty
+ ceph-osd-replication-count: 1
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -223,4 +283,6 @@ trusty-kilo:
openstack-origin: cloud:trusty-kilo
source: cloud:trusty-kilo
series: trusty
+ ceph-osd-replication-count: 1
+