summaryrefslogtreecommitdiffstats
path: root/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml')
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml7
1 files changed, 1 insertions, 6 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 9eed91f3..4e14a040 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -1,8 +1,6 @@
# vim: set ts=2 et:
trusty-mitaka-nodes:
inherits: openstack-phase1
- overrides:
- series: trusty
trusty-mitaka:
inherits: openstack-phase2
@@ -15,13 +13,11 @@ trusty-mitaka:
region: Canonical
#source: "cloud:trusty-mitaka"
openstack-origin: "cloud:trusty-mitaka"
- series: trusty
#ceph-osd-replication-count: 2
admin-role: admin
keystone-admin-role: admin
openstack-phase1:
- series: trusty
services:
nodes:
charm: "cs:trusty/ubuntu"
@@ -186,7 +182,6 @@ openstack-phase2:
monitor-count: 3
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: ""
# osd-reformat: 'yes'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
@@ -345,6 +340,6 @@ openstack-phase2:
congress:
charm: local:trusty/congress
options:
- source-branch: stable/mitaka
+ #source-branch: stable/mitaka
to:
- "lxc:nodes=0"