summaryrefslogtreecommitdiffstats
path: root/ci/nosdn/juju-deployer
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-06-14 12:22:04 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-06-14 12:22:51 -0500
commitb2aea8c07c74ea8e35ddc8d5a50beb1c4b65d04b (patch)
tree47ed9e81d0a270d129f8ae0929eadde2689aad52 /ci/nosdn/juju-deployer
parentf6ae2a4c44347d691b4d6c04a156b6a4e82afa25 (diff)
remove the override series as it is controlled by juju now.
Change-Id: I042d9d43c30218dfbcbc6be06fb921420eff6232 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/nosdn/juju-deployer')
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml7
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml7
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml7
3 files changed, 3 insertions, 18 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"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 48f69c17..90ac3291 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.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"
@@ -147,7 +143,6 @@ openstack-phase2:
monitor-count: 2
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
@@ -266,6 +261,6 @@ openstack-phase2:
congress:
charm: local:trusty/congress
options:
- source-branch: stable/mitaka
+ #source-branch: stable/mitaka
to:
- "lxc:nodes=1"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 320b29e9..38d975c6 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.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"
@@ -157,7 +153,6 @@ openstack-phase2:
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: ""
monitor-count: 2
# osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
@@ -268,6 +263,6 @@ openstack-phase2:
congress:
charm: local:trusty/congress
options:
- source-branch: stable/mitaka
+ #source-branch: stable/mitaka
to:
- "lxc:nodes=1"