summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/01-deploybundle.sh3
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml68
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml67
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml47
-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
7 files changed, 18 insertions, 304 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 1c3a5104..a4c47df9 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -24,6 +24,9 @@ case "$1" in
;;
esac
+#changing the target to the openstack release we want to deploy.
+sed -i -- "s|mitaka|$2|g" ./bundles.yaml
+
case "$3" in
'orangepod1' )
# As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 429bc9b4..20846302 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -315,6 +315,7 @@ openstack-phase2:
- keystone:identity-service
- - heat:amqp
- rabbitmq-server:amqp
+
trusty-mitaka-nodes:
inherits: openstack-phase1
overrides:
@@ -336,70 +337,3 @@ trusty-mitaka:
ceph-osd-replication-count: 2
admin-role: admin
keystone-admin-role: admin
-
-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:
- inherits: openstack-phase1
- overrides:
- series: trusty
-
-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
- #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/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 33b13008..b078b302 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -273,70 +273,3 @@ trusty-mitaka:
ceph-osd-replication-count: 2
admin-role: admin
keystone-admin-role: admin
-
-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:
- inherits: openstack-phase1
- overrides:
- series: trusty
-
-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
- #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/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index dd370877..e8c560bf 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -249,6 +249,7 @@ openstack-phase2:
- "ceph:radosgw"
- - "ceph-radosgw:identity-service"
- "keystone:identity-service"
+
trusty-mitaka-nodes:
inherits: openstack-phase1
overrides:
@@ -271,49 +272,3 @@ trusty-mitaka:
admin-role: admin
keystone-admin-role: admin
-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
-
-# master
-trusty-kilo:
- 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
- series: trusty
- ceph-osd-replication-count: 2
- admin-role: admin
- keystone-admin-role: admin
-
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