summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-04-29 23:33:02 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-04-29 23:35:28 -0500
commit4c67c06c1bb59cb6a7b17718c7bc27cf784ca80d (patch)
tree790ff59c28da918b11ccea8d186877aa07e4a968
parent2019d07fcf8aed6f456a25ba6d69bbfac93ffe18 (diff)
modified to support mitaka release with Trusty.
Change-Id: Ibd41bcd7ed394cbedaccd9b66650fced7a6ab75e Author: Narinder Gupta <narinder.gupta@canonical.com> Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml22
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml22
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml22
3 files changed, 66 insertions, 0 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index db599bcf..8df30b26 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -314,6 +314,28 @@ openstack-phase2:
- keystone:identity-service
- - heat:amqp
- rabbitmq-server:amqp
+trusty-mitaka-nodes:
+ inherits: openstack-phase1
+ overrides:
+ series: trusty
+
+trusty-mitaka:
+ 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-mitaka"
+ openstack-origin: "cloud:trusty-mitaka"
+ series: trusty
+ ceph-osd-replication-count: 2
+ admin-role: admin
+ keystone-admin-role: admin
+
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index e86990aa..41d218d4 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -251,6 +251,28 @@ openstack-phase2:
- keystone:identity-service
- - heat:amqp
- rabbitmq-server:amqp
+trusty-mitaka-nodes:
+ inherits: openstack-phase1
+ overrides:
+ series: trusty
+
+trusty-mitaka:
+ 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-mitaka"
+ openstack-origin: "cloud:trusty-mitaka"
+ series: trusty
+ ceph-osd-replication-count: 2
+ admin-role: admin
+ keystone-admin-role: admin
+
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 8a16129c..a5b6cef8 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -249,6 +249,28 @@ openstack-phase2:
- "ceph:radosgw"
- - "ceph-radosgw:identity-service"
- "keystone:identity-service"
+trusty-mitaka-nodes:
+ inherits: openstack-phase1
+ overrides:
+ series: trusty
+
+trusty-mitaka:
+ 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-mitaka"
+ openstack-origin: "cloud:trusty-mitaka"
+ series: trusty
+ ceph-osd-replication-count: 2
+ admin-role: admin
+ keystone-admin-role: admin
+
trusty-liberty-nodes:
inherits: openstack-phase1
overrides: