diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-21 12:56:56 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-21 19:04:29 +0000 |
| commit | 4c8c242f27eb9cda5ea679455a8ef94a93cc17f6 (patch) | |
| tree | 05bb9bf6fa115c8a4250db63a60982ca3f5e4156 /ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | |
| parent | 7b0d901cd707fcdb1693a1de2c32cf39610e1234 (diff) | |
modified to fix the orange pod issue regarding glance where ceph
was on data network rather than admin network.
Change-Id: I2940aae3a34cad843372036c4815e692d822af84
(cherry picked from commit ed9bdc677f6be57776cc1c8939c841ed9dae11a4)
Diffstat (limited to 'ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml')
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index e3795792..3be7e824 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -34,12 +34,12 @@ openstack-phase2: monitor-count: 1 fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv - osd-reformat: 'yes' + osd-devices: "" +# osd-reformat: 'yes' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: - - "nodes-compute=0" + - "lxc:nodes-api=0" ceph-osd: branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next" num_units: 1 @@ -47,7 +47,7 @@ openstack-phase2: osd-devices: /srv osd-reformat: 'yes' to: - - "nodes-api=0" + - "nodes-compute=0" ceph-radosgw: branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next" num_units: 1 @@ -258,6 +258,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" @@ -276,6 +277,7 @@ trusty-kilo: 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-kilo" @@ -294,6 +296,7 @@ trusty-juno: 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-juno" |