summaryrefslogtreecommitdiffstats
path: root/ci/odl/juju-deployer
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-05-06 08:22:28 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-05-06 08:24:54 -0500
commit6b278d545d9e7f61affa29edfde1d34c6a7eb24b (patch)
tree781ae6128f36bb82f7c549c0037b9c47f7691992 /ci/odl/juju-deployer
parent1a5ba662226bb7bbf3b5f2c6bb95e8b62998bda1 (diff)
remove the extra entries and now changing it during run time.
Change-Id: I069bad6c933232b3da210030e23cb82a755616ee Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/odl/juju-deployer')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml53
-rw-r--r--ci/odl/juju-deployer/ovs-odl-nonha.yaml51
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml33
3 files changed, 13 insertions, 124 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 3705200b..95ec5745 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -426,12 +426,12 @@ openstack-phase2:
- - "ceph-radosgw:identity-service"
- "keystone:identity-service"
-trusty-liberty-nodes:
+trusty-mitaka-nodes:
inherits: openstack-phase1
overrides:
series: trusty
-trusty-liberty:
+trusty-mitaka:
inherits: openstack-phase2
overrides:
# cluster_count: 3
@@ -442,55 +442,10 @@ trusty-liberty:
#l2-population: true
#ext-port: "eth1"
region: Canonical
- source: "cloud:trusty-liberty"
- openstack-origin: "cloud:trusty-liberty"
+ source: "cloud:trusty-mitaka"
+ openstack-origin: "cloud:trusty-mitaka"
series: trusty
ceph-osd-replication-count: 2
admin-role: admin
keystone-admin-role: admin
-trusty-kilo-nodes:
- inherits: openstack-phase1
- overrides:
- series: trusty
-
-trusty-kilo:
- inherits: openstack-phase2
- overrides:
-# cluster_count: 3
- #os-data-network: 10.4.8.0/21
- #ceph-cluster-network: 10.4.0.0/21
- #prefer-ipv6: true
- #enable-dvr: true
- #l2-population: true
- #ext-port: "eth1"
- region: Canonical
- source: "cloud:trusty-kilo"
- openstack-origin: "cloud:trusty-kilo"
- series: trusty
- ceph-osd-replication-count: 2
- admin-role: admin
- keystone-admin-role: admin
-
-trusty-juno-nodes:
- inherits: openstack-phase1
- overrides:
- series: trusty
-
-trusty-juno:
- inherits: openstack-phase2
- overrides:
-# cluster_count: 3
- #os-data-network: 10.4.8.0/21
- #ceph-cluster-network: 10.4.0.0/21
- #prefer-ipv6: true
- #enable-dvr: true
- #l2-population: true
- #ext-port: "eth1"
- region: Canonical
- source: "cloud:trusty-juno"
- openstack-origin: "cloud:trusty-juno"
- series: trusty
- ceph-osd-replication-count: 2
- admin-role: admin
- keystone-admin-role: admin
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 82c18beb..ee5ab664 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -263,56 +263,13 @@ openstack-phase2:
- "ceph:radosgw"
- - "ceph-radosgw:identity-service"
- "keystone:identity-service"
-trusty-liberty-nodes:
- inherits: openstack-phase1
- overrides:
- series: trusty
-
-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
- #enable-dvr: true
- #l2-population: true
- #ext-port: "eth1"
- region: Canonical
- source: "cloud:trusty-liberty"
- openstack-origin: "cloud:trusty-liberty"
- series: trusty
- ceph-osd-replication-count: 2
- admin-role: admin
- keystone-admin-role: admin
-
-trusty-kilo-nodes:
- inherits: openstack-phase1
- overrides:
- series: trusty
-
-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
- #enable-dvr: true
- #l2-population: true
- #ext-port: "eth1"
- region: Canonical
- source: "cloud:trusty-kilo"
- openstack-origin: "cloud:trusty-kilo"
- series: trusty
- ceph-osd-replication-count: 2
- admin-role: admin
- keystone-admin-role: admin
-trusty-juno-nodes:
+trusty-mitaka-nodes:
inherits: openstack-phase1
overrides:
series: trusty
-trusty-juno:
+trusty-mitaka:
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
@@ -322,8 +279,8 @@ trusty-juno:
#l2-population: true
#ext-port: "eth1"
region: Canonical
- source: "cloud:trusty-juno"
- openstack-origin: "cloud:trusty-juno"
+ source: "cloud:trusty-mitaka"
+ openstack-origin: "cloud:trusty-mitaka"
series: trusty
ceph-osd-replication-count: 2
admin-role: admin
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index d5f3b16e..baa6d6c6 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -265,47 +265,24 @@ openstack-phase2:
- "ceph:radosgw"
- - "ceph-radosgw:identity-service"
- "keystone:identity-service"
-trusty-liberty-nodes:
- inherits: openstack-phase1
- overrides:
- series: trusty
-
-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
- #enable-dvr: true
- #l2-population: true
- #ext-port: "eth1"
- region: Canonical
- source: "cloud:trusty-liberty"
- openstack-origin: "cloud:trusty-liberty"
- series: trusty
- ceph-osd-replication-count: 2
- admin-role: admin
- keystone-admin-role: admin
-trusty-kilo-nodes:
+trusty-mitaka-nodes:
inherits: openstack-phase1
overrides:
series: trusty
-# master
-trusty-kilo:
+trusty-mitaka:
inherits: openstack-phase2
- series: trusty
overrides:
- region: Canonical
#os-data-network: 10.4.8.0/21
#ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
#enable-dvr: true
#l2-population: true
#ext-port: "eth1"
- openstack-origin: cloud:trusty-kilo
- source: cloud:trusty-kilo
+ region: Canonical
+ source: "cloud:trusty-mitaka"
+ openstack-origin: "cloud:trusty-mitaka"
series: trusty
ceph-osd-replication-count: 2
admin-role: admin