diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-21 13:26:43 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-21 19:29:12 +0000 |
| commit | 4da5e51455b0a2fd409ee5cc527c4e0534fb6118 (patch) | |
| tree | 292c1ddc52e0cc05f65366456c72fb2c31d3a75b /ci/onos/juju-deployer/ovs-onos-ha.yaml | |
| parent | 4c8c242f27eb9cda5ea679455a8ef94a93cc17f6 (diff) | |
modified the ceph deployment for onos and opencontrail sdn.
Change-Id: I294e95b2ff9161a3cc4dbd9a551e5ce45b7a105b
(cherry picked from commit 8a768a5da2849f34be850c86755f72d5738be39d)
Diffstat (limited to 'ci/onos/juju-deployer/ovs-onos-ha.yaml')
| -rw-r--r-- | ci/onos/juju-deployer/ovs-onos-ha.yaml | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml index 0e9373b7..56304ac3 100644 --- a/ci/onos/juju-deployer/ovs-onos-ha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml @@ -86,26 +86,28 @@ openstack-phase2: - "lxc:nodes-api=0" ceph: branch: "lp:~openstack-charmers/charms/trusty/ceph/next" - num_units: 2 + num_units: 3 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv - monitor-count: 1 - osd-reformat: 'no' + osd-devices: "" + monitor-count: 3 +# osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: - - "nodes-compute=0" - - "nodes-compute=1" + - "lxc:nodes-api=2" + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" ceph-osd: branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next" - num_units: 1 + num_units: 2 options: osd-devices: /srv osd-reformat: 'yes' to: - - "nodes-api=0" + - "nodes-compute=0" + - "nodes-compute=1" ceph-radosgw: branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next" num_units: 3 @@ -344,6 +346,7 @@ trusty-liberty: overrides: cluster_count: 3 #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" @@ -363,6 +366,7 @@ trusty-kilo: overrides: cluster_count: 3 #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" @@ -382,6 +386,7 @@ trusty-juno: overrides: cluster_count: 3 #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" |