summaryrefslogtreecommitdiffstats
path: root/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-01-21 19:04:20 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-21 19:04:20 +0000
commit46241fade3a2261e4b33f399c552222317b896b2 (patch)
tree5eca0fcc3b9509240c282ff9c5303b33ef44f77c /ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
parenta62a80944d6f925fbead89ee0718d84b8b5ef296 (diff)
parented9bdc677f6be57776cc1c8939c841ed9dae11a4 (diff)
Merge "modified to fix the orange pod issue regarding glance where ceph was on data network rather than admin network."
Diffstat (limited to 'ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml')
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml44
1 files changed, 25 insertions, 19 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index c342d43d..75f3cafd 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -50,30 +50,28 @@ openstack-phase2:
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:
branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
num_units: 1
@@ -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