summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml74
-rw-r--r--ci/odl/juju-deployer/ovs-odl.yaml124
2 files changed, 143 insertions, 55 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
+
diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml
index 3af66154..17ca1183 100644
--- a/ci/odl/juju-deployer/ovs-odl.yaml
+++ b/ci/odl/juju-deployer/ovs-odl.yaml
@@ -10,25 +10,33 @@ openstack-phase1:
charm: "local:trusty/ubuntu-nodes-compute"
num_units: 1
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:
- ceilometer:
+ 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
to:
- "lxc:nodes-api=0"
- ceilometer-agent:
+ "ceilometer-agent":
branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
- mongodb:
- charm: cs:trusty/mongodb
+ "mongodb":
+ charm: "cs:trusty/mongodb"
num_units: 1
to:
- "lxc:nodes-api=0"
@@ -36,100 +44,96 @@ openstack-phase2:
branch: "lp:~openstack-charmers/charms/trusty/heat/next"
to:
- "lxc:nodes-api=0"
-# ceph:
-# charm: cs:trusty/ceph
-# num_units: 1
-# options:
-# fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-# monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-# osd-devices: /dev/sdb
+ ceph:
+ charm: cs:trusty/ceph
+ num_units: 1
+ options:
+ fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
+ monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+ osd-devices: /srv
+ monitor-count: 1
# osd-reformat: 'yes'
-# source: cloud:trusty-kilo
-# to:
-# - "nodes-compute=0"
+# 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'
-# source: cloud:trusty-kilo
# to:
# - "lxc:nodes-api=0"
# ceph-radosgw:
# charm: cs:trusty/ceph-radosgw
# num_units: 1
# options:
-# source: cloud:trusty-kilo
# 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
-# to:
-# - "lxc:nodes-api=0"
-# cinder-ceph:
-# charm: cs:trusty/cinder-cep
-
- "mysql":
- charm: "cs:trusty/mysql"
+ cinder:
+ charm: cs:trusty/cinder
num_units: 1
options:
- "dataset-size": 2G
- "max-connections": 10000
+ block-device: None
+ glance-api-version: 2
+# ha-mcastport: 5401
to:
- "lxc:nodes-api=0"
- "rabbitmq-server":
+ cinder-ceph:
+ charm: cs:trusty/cinder-ceph
+ "rabbitmq-server":
branch: lp:charms/trusty/rabbitmq-server
num_units: 1
to:
- "lxc:nodes-api=0"
- "keystone":
+ "keystone":
branch: lp:charms/trusty/keystone
num_units: 1
- options:
+ options:
+# ha-mcastport: 5402
"admin-password": openstack
"admin-token": admin
to:
- "lxc:nodes-api=0"
- "openstack-dashboard":
+ "openstack-dashboard":
branch: lp:charms/trusty/openstack-dashboard
num_units: 1
- options:
+ options:
secret: admin
webroot: /
to:
- "lxc:nodes-api=0"
- "nova-compute":
+ "nova-compute":
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
num_units: 1
- options:
+ options:
"enable-live-migration": False
"manage-neutron-plugin-legacy-mode": False
to:
- "nodes-compute=0"
# - "nodes-compute=1"
- "nova-cloud-controller":
+# - "nodes-api=0"
+# - "nodes-api=1"
+# - "nodes-api=2"
+ "nova-cloud-controller":
branch: lp:charms/trusty/nova-cloud-controller
num_units: 1
- options:
+ options:
"console-access-protocol": novnc
"network-manager": Neutron
"quantum-security-groups": "yes"
to:
- "lxc:nodes-api=0"
- "neutron-api":
+ "neutron-api":
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
num_units: 1
options:
neutron-security-groups: True
manage-neutron-plugin-legacy-mode: False
- to:
+ to:
- "lxc:nodes-api=0"
neutron-gateway:
branch: lp:charms/trusty/neutron-gateway
@@ -137,7 +141,7 @@ openstack-phase2:
# "ext-port": "eth1"
plugin: ovs-odl
instance-mtu: 1400
- to:
+ to:
- "nodes-api=0"
odl-controller:
branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
@@ -147,9 +151,9 @@ openstack-phase2:
http-proxy: "http://squid.internal:3128"
https-proxy: "http://squid.internal:3128"
- to:
+ to:
- "lxc:nodes-api=0"
- "glance":
+ "glance":
branch: lp:charms/trusty/glance
num_units: 1
to:
@@ -228,6 +232,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:
@@ -241,6 +263,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
@@ -255,6 +278,7 @@ trusty-kilo:
source: "cloud:trusty-kilo"
"openstack-origin": "cloud:trusty-kilo"
series: trusty
+ ceph-osd-replication-count: 1
trusty-juno-nodes:
@@ -270,4 +294,6 @@ trusty-juno:
source: "cloud:trusty-juno"
"openstack-origin": "cloud:trusty-juno"
series: trusty
+ ceph-osd-replication-count: 1
+