remove the override series as it is controlled by juju now.

Change-Id: I042d9d43c30218dfbcbc6be06fb921420eff6232
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

13 files changed, 16 insertions, 65 deletions

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 61602ba8..4e465c5c 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -113,11 +113,11 @@ sed -i -- "s|mitaka|$2|g" ./bundles.yaml
 case "$6" in
     'trusty' )
         sed -i -- "s|#source|source|g" ./bundles.yaml
+        sed -i -- "s|#source-branch:|source-branch:|g" ./bundles.yaml
         ;;
     'xenial' )
         #changing the target to the ubuntu distro we want to deploy.
         sed -i -- "s|trusty|$6|g" ./bundles.yaml
-        sed -i -- "s|source-branch:|#source-branch:|g" ./bundles.yaml
         ;;
 esac
 
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 9eed91f3..4e14a040 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-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"
@@ -186,7 +182,6 @@ openstack-phase2:
         monitor-count: 3
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: ""
 #        osd-reformat: 'yes'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
@@ -345,6 +340,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/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 48f69c17..90ac3291 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-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"
@@ -147,7 +143,6 @@ openstack-phase2:
         monitor-count: 2
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: ""
 #        osd-reformat: 'yes'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
@@ -266,6 +261,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/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 320b29e9..38d975c6 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-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"
@@ -157,7 +153,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
@@ -268,6 +263,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-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"
diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index 0f8bfa80..f6f54a95 100644
--- a/ci/onos/juju-deployer/ovs-onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-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"
@@ -215,7 +211,6 @@ openstack-phase2:
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: ""
         monitor-count: 3
 #        osd-reformat: 'no'
 #        ceph-cluster-network: 192.168.0.0/24
@@ -363,6 +358,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/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index 1f022c5f..f8f53cbb 100644
--- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-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
@@ -270,6 +265,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/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index e574bcc6..f1d10687 100644
--- a/ci/onos/juju-deployer/ovs-onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-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"
@@ -159,7 +155,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
@@ -274,6 +269,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/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index b1b69a68..6e84b6cf 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-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:
     nodes:
@@ -386,6 +382,6 @@ openstack-phase2:
     congress:
       charm: local:trusty/congress
       options:
-        source-charm: stable/mitaka
+        #source-charm: stable/mitaka
       to:
         - "lxc:nodes=0"
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
index 7ed715e5..8b19ee3a 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
@@ -156,7 +156,7 @@ openstack-phase2:
     congress:
       charm: local:trusty/congress
       options:
-        source-branch: stable/mitaka
+        #source-branch: stable/mitaka
       to:
         - "lxc:nodes-api=0"
   relations:
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index 401a71b9..473eb35a 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
@@ -162,7 +162,7 @@ openstack-phase2:
     congress:
       charm: local:trusty/congress
       options:
-        source-branch: stable/mitaka
+        #source-branch: stable/mitaka
       to:
         - "lxc:nodes-api=0"
   relations: