From 6b278d545d9e7f61affa29edfde1d34c6a7eb24b Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 6 May 2016 08:22:28 -0500 Subject: remove the extra entries and now changing it during run time. Change-Id: I069bad6c933232b3da210030e23cb82a755616ee Signed-off-by: Narinder Gupta --- ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 68 +------------------------------- 1 file changed, 1 insertion(+), 67 deletions(-) (limited to 'ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml') 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 - -- cgit 1.2.3-korg