From 8a768a5da2849f34be850c86755f72d5738be39d Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 21 Jan 2016 13:26:43 -0600 Subject: modified the ceph deployment for onos and opencontrail sdn. Change-Id: I294e95b2ff9161a3cc4dbd9a551e5ce45b7a105b --- .../juju-deployer/ovs-opencontrail-tip.yaml | 42 ++++++++++++---------- 1 file changed, 23 insertions(+), 19 deletions(-) (limited to 'ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml') diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml index 6e1f700d..25c81b16 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml @@ -61,29 +61,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: charm: cs:trusty/cinder num_units: 1 @@ -234,7 +233,9 @@ contrail: - [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ] - [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ] - [ neutron-contrail, keystone ] - + - [ "ceph-osd:mon", "ceph:osd" ] + - [ "ceph-radosgw:mon", "ceph:radosgw" ] + - [ "ceph-radosgw:identity-service", "keystone:identity-service" ] trusty-liberty-nodes: inherits: openstack-phase1 series: trusty @@ -252,6 +253,7 @@ trusty-liberty: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-liberty @@ -277,6 +279,7 @@ trusty-kilo: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-kilo @@ -301,6 +304,7 @@ trusty-juno: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-juno -- cgit 1.2.3-korg