From b2aea8c07c74ea8e35ddc8d5a50beb1c4b65d04b Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Tue, 14 Jun 2016 12:22:04 -0500
Subject: remove the override series as it is controlled by juju now.

Change-Id: I042d9d43c30218dfbcbc6be06fb921420eff6232
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
 ci/odl/juju-deployer/ovs-odl-ha.yaml    | 9 ++-------
 ci/odl/juju-deployer/ovs-odl-nonha.yaml | 9 ++-------
 ci/odl/juju-deployer/ovs-odl-tip.yaml   | 9 ++-------
 3 files changed, 6 insertions(+), 21 deletions(-)

(limited to 'ci/odl/juju-deployer')

diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index b6f492c9..3273d0d0 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-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"
@@ -243,7 +239,6 @@ openstack-phase2:
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: ""
         monitor-count: 3
 #        osd-reformat: 'false'
 #        ceph-cluster-network: 192.168.0.0/24
@@ -389,7 +384,7 @@ openstack-phase2:
         - "lxc:nodes=1"
         - "lxc:nodes=2"
     opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
+      charm: local:trusty/promise
       to:
         - "lxc:nodes=0"
     neutron-api-odl:
@@ -402,6 +397,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/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index d4ca6019..269bf250 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-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"
@@ -161,7 +157,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
@@ -261,7 +256,7 @@ openstack-phase2:
       to:
         - "lxc:nodes=1"
     opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
+      charm: local:trusty/promise
       to:
         - "lxc:nodes=0"
     neutron-api-odl:
@@ -274,6 +269,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/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 67d2b239..4bd4e1e5 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-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"
@@ -163,7 +159,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
@@ -269,7 +264,7 @@ openstack-phase2:
       to:
         - "lxc:nodes=0"
     opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
+      charm: local:trusty/promise
       to:
         - "lxc:nodes=1"
     neutron-api-odl:
@@ -282,6 +277,6 @@ openstack-phase2:
     congress:
       charm: local:trusty/congress
       options:
-        source-branch: stable/mitaka
+        #source-branch: stable/mitaka
       to:
         - "lxc:nodes=0"
-- 
cgit 1.2.3-korg