10 files changed, 81 insertions, 75 deletions
diff --git a/ci/00-bootstrap.sh b/ci/00-bootstrap.sh
index 961626b7..375faa77 100755
--- a/ci/00-bootstrap.sh
+++ b/ci/00-bootstrap.sh
@@ -6,7 +6,8 @@ set -ex
 
 juju bootstrap --debug --to bootstrap.maas
 sleep 5
-juju deploy juju-gui --to 0
+#disable juju gui until xenial charms are in charm store.
+#juju deploy juju-gui --to 0
 
 JUJU_REPOSITORY=
 juju set-constraints tags=
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 6640ef0a..2d6dc52c 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -7,8 +7,8 @@ set -ex
     #copy and download charms
     cp $4/fetch-charms.sh ./fetch-charms.sh
     #modify the ubuntu series wants to deploy
-    sed -i -- "s|trusty|$6|g" ./fetch-charms.sh
-    sh ./fetch-charms.sh
+    sed -i -- "s|distro=trusty|distro=$6|g" ./fetch-charms.sh
+    sh ./fetch-charms.sh $6
 
 
 case "$1" in
@@ -31,8 +31,16 @@ esac
 #changing the target to the openstack release we want to deploy. 
 sed -i -- "s|mitaka|$2|g" ./bundles.yaml
 
-#changing the target to the ubuntu distro we want to deploy. 
-sed -i -- "s|trusty|$6|g" ./bundles.yaml
+#update source if trusty is target distribution
+case "$6" in
+    'trusty' )
+        sed -i -- "s|#source|source|g" ./bundles.yaml
+        ;;
+    'xenial' )
+        #changing the target to the ubuntu distro we want to deploy. 
+        sed -i -- "s|trusty|$6|g" ./bundles.yaml
+        ;;
+esac
 
 case "$3" in
     'orangepod1' )
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 1c1074ed..2f6371aa 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -1,26 +1,28 @@
 #!/bin/sh -ex
 
-distro=trusty
+distro=$1
 mkdir -p $distro
 
 # openstack
-bzr branch lp:~openstack-charmers/charms/$distro/ceilometer/next $distro/ceilometer
-bzr branch lp:~openstack-charmers/charms/$distro/ceilometer-agent/next $distro/ceilometer-agent
-bzr branch lp:~openstack-charmers/charms/$distro/ceph/next $distro/ceph
-bzr branch lp:~openstack-charmers/charms/$distro/ceph-osd/next $distro/ceph-osd
-bzr branch lp:~openstack-charmers/charms/$distro/ceph-radosgw/next $distro/ceph-radosgw
-bzr branch lp:~openstack-charmers/charms/$distro/cinder/next $distro/cinder
-bzr branch lp:~openstack-charmers/charms/$distro/cinder-ceph/next $distro/cinder-ceph
-bzr branch lp:~openstack-charmers/charms/$distro/glance/next $distro/glance
-bzr branch lp:~narindergupta/charms/$distro/promise/trunk $distro/promise
-bzr branch lp:~openstack-charmers/charms/$distro/keystone/next $distro/keystone
-bzr branch lp:~openstack-charmers/charms/$distro/percona-cluster/next $distro/percona-cluster
-bzr branch lp:~openstack-charmers/charms/$distro/neutron-api/next $distro/neutron-api
-bzr branch lp:~openstack-charmers/charms/$distro/neutron-gateway/next $distro/neutron-gateway
-bzr branch lp:~openstack-charmers/charms/$distro/neutron-openvswitch/next $distro/neutron-openvswitch
-bzr branch lp:~openstack-charmers/charms/$distro/nova-cloud-controller/next $distro/nova-cloud-controller
-bzr branch lp:~openstack-charmers/charms/$distro/nova-compute/next $distro/nova-compute
-bzr branch lp:~openstack-charmers/charms/$distro/openstack-dashboard/next $distro/openstack-dashboard
-bzr branch lp:~openstack-charmers/charms/$distro/rabbitmq-server/next $distro/rabbitmq-server
-bzr branch lp:~openstack-charmers/charms/$distro/hacluster/next $distro/hacluster
-bzr branch lp:~openstack-charmers/charms/$distro/heat/next $distro/heat
+bzr branch lp:~openstack-charmers/charms/trusty/ceilometer/next $distro/ceilometer
+bzr branch lp:~openstack-charmers/charms/trusty/ceilometer-agent/next $distro/ceilometer-agent
+bzr branch lp:~openstack-charmers/charms/trusty/ceph/next $distro/ceph
+bzr branch lp:~openstack-charmers/charms/trusty/ceph-osd/next $distro/ceph-osd
+bzr branch lp:~openstack-charmers/charms/trusty/ceph-radosgw/next $distro/ceph-radosgw
+bzr branch lp:~openstack-charmers/charms/trusty/cinder/next $distro/cinder
+bzr branch lp:~openstack-charmers/charms/trusty/cinder-ceph/next $distro/cinder-ceph
+bzr branch lp:~openstack-charmers/charms/trusty/glance/next $distro/glance
+bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
+bzr branch lp:~openstack-charmers/charms/trusty/keystone/next $distro/keystone
+bzr branch lp:~openstack-charmers/charms/trusty/percona-cluster/next $distro/percona-cluster
+bzr branch lp:~openstack-charmers/charms/trusty/neutron-api/next $distro/neutron-api
+bzr branch lp:~openstack-charmers/charms/trusty/neutron-gateway/next $distro/neutron-gateway
+bzr branch lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next $distro/neutron-openvswitch
+bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next $distro/nova-cloud-controller
+bzr branch lp:~openstack-charmers/charms/trusty/nova-compute/next $distro/nova-compute
+bzr branch lp:~openstack-charmers/charms/trusty/openstack-dashboard/next $distro/openstack-dashboard
+bzr branch lp:~openstack-charmers/charms/trusty/rabbitmq-server/next $distro/rabbitmq-server
+bzr branch lp:~openstack-charmers/charms/trusty/hacluster/next $distro/hacluster
+bzr branch lp:~openstack-charmers/charms/trusty/heat/next $distro/heat
+bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
+bzr branch lp:~openstack-charmers-next/charms/xenial/ntp/trunk $distro/ntp
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 20846302..91c55ea3 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -11,7 +11,7 @@ openstack-phase1:
       num_units: 2
       constraints: tags=compute
     ntp: 
-      charm: "cs:trusty/ntp"
+      charm: "local:trusty/ntp"
   relations:
     - - "ntp:juju-info"
       - "nodes-api:juju-info"
@@ -87,7 +87,6 @@ openstack-phase2:
         - "lxc:nodes-api=1"
     opnfv-promise:
       charm: local:trusty/promise
-      num_units: 1
       to:
         - "lxc:nodes-api=2"
     keystone:
@@ -103,7 +102,7 @@ openstack-phase2:
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     mongodb:
-      charm: cs:trusty/mongodb
+      charm: local:trusty/mongodb
       num_units: 1
       to:
         - "lxc:nodes-api=0"
@@ -331,7 +330,7 @@ trusty-mitaka:
     #l2-population: true
     #ext-port: "eth1"
     region: Canonical
-    source: "cloud:trusty-mitaka"
+    #source: "cloud:trusty-mitaka"
     openstack-origin: "cloud:trusty-mitaka"
     series: trusty
     ceph-osd-replication-count: 2
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index b078b302..f4e73bbc 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -11,7 +11,7 @@ openstack-phase1:
       num_units: 2
       constraints: tags=compute
     ntp: 
-      charm: "cs:trusty/ntp"
+      charm: "local:trusty/ntp"
   relations:
     - - "ntp:juju-info"
       - "nodes-api:juju-info"
@@ -79,7 +79,6 @@ openstack-phase2:
         - "lxc:nodes-api=0"
     opnfv-promise:
       charm: local:trusty/promise
-      num_units: 1
       to:
         - "lxc:nodes-api=0"
     keystone:
@@ -92,8 +91,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     mongodb:
-      charm: cs:trusty/mongodb
-      num_units: 1
+      charm: local:trusty/mongodb
       to:
         - "lxc:nodes-api=0"
     mysql:
@@ -267,7 +265,7 @@ trusty-mitaka:
     #l2-population: true
     #ext-port: "eth1"
     region: Canonical
-    source: "cloud:trusty-mitaka"
+    #source: "cloud:trusty-mitaka"
     openstack-origin: "cloud:trusty-mitaka"
     series: trusty
     ceph-osd-replication-count: 2
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index e8c560bf..ce2f25df 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -11,7 +11,7 @@ openstack-phase1:
       num_units: 2
       constraints: tags=compute
     ntp:
-      charm: "cs:trusty/ntp"
+      charm: "local:trusty/ntp"
   relations:
     - - "ntp:juju-info"
       - "nodes-api:juju-info"
@@ -36,7 +36,7 @@ openstack-phase2:
     ceilometer-agent:
       charm: "local:trusty/ceilometer-agent"
     mongodb:
-      charm: "cs:trusty/mongodb"
+      charm: "local:trusty/mongodb"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
@@ -155,7 +155,6 @@ openstack-phase2:
         - "lxc:nodes-api=0"
     opnfv-promise:
       charm: local:trusty/promise
-      num_units: 1
       to:
         - "lxc:nodes-api=0"
     neutron-openvswitch:
@@ -265,7 +264,7 @@ trusty-mitaka:
     #l2-population: true
     #ext-port: "eth1"
     region: Canonical
-    source: "cloud:trusty-mitaka"
+    #source: "cloud:trusty-mitaka"
     openstack-origin: "cloud:trusty-mitaka"
     series: trusty
     ceph-osd-replication-count: 2
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index a1b73043..c541df44 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -1,32 +1,34 @@
 #!/bin/sh -ex
 
-distro=trusty
+distro=$1
 mkdir -p $distro
 
 # openstack
-bzr branch lp:~openstack-charmers/charms/$distro/ceilometer/next $distro/ceilometer
-bzr branch lp:~openstack-charmers/charms/$distro/ceilometer-agent/next $distro/ceilometer-agent
-bzr branch lp:~openstack-charmers/charms/$distro/ceph/next $distro/ceph
-bzr branch lp:~openstack-charmers/charms/$distro/ceph-osd/next $distro/ceph-osd
-bzr branch lp:~openstack-charmers/charms/$distro/ceph-radosgw/next $distro/ceph-radosgw
-bzr branch lp:~openstack-charmers/charms/$distro/cinder/next $distro/cinder
-bzr branch lp:~openstack-charmers/charms/$distro/cinder-ceph/next $distro/cinder-ceph
-bzr branch lp:~openstack-charmers/charms/$distro/glance/next $distro/glance
-bzr branch lp:~narindergupta/charms/$distro/promise/trunk $distro/promise
-bzr branch lp:~openstack-charmers/charms/$distro/keystone/next $distro/keystone
-bzr branch lp:~openstack-charmers/charms/$distro/percona-cluster/next $distro/percona-cluster
-bzr branch lp:~openstack-charmers/charms/$distro/neutron-api/next $distro/neutron-api
-bzr branch lp:~openstack-charmers/charms/$distro/neutron-gateway/next $distro/neutron-gateway
-bzr branch lp:~openstack-charmers/charms/$distro/neutron-openvswitch/next $distro/neutron-openvswitch
-bzr branch lp:~openstack-charmers/charms/$distro/nova-cloud-controller/next $distro/nova-cloud-controller
-bzr branch lp:~openstack-charmers/charms/$distro/nova-compute/next $distro/nova-compute
-bzr branch lp:~openstack-charmers/charms/$distro/openstack-dashboard/next $distro/openstack-dashboard
-bzr branch lp:~openstack-charmers/charms/$distro/rabbitmq-server/next $distro/rabbitmq-server
-bzr branch lp:~openstack-charmers/charms/$distro/hacluster/next $distro/hacluster
-bzr branch lp:~openstack-charmers/charms/$distro/heat/next $distro/heat
+bzr branch lp:~openstack-charmers/charms/trusty/ceilometer/next $distro/ceilometer
+bzr branch lp:~openstack-charmers/charms/trusty/ceilometer-agent/next $distro/ceilometer-agent
+bzr branch lp:~openstack-charmers/charms/trusty/ceph/next $distro/ceph
+bzr branch lp:~openstack-charmers/charms/trusty/ceph-osd/next $distro/ceph-osd
+bzr branch lp:~openstack-charmers/charms/trusty/ceph-radosgw/next $distro/ceph-radosgw
+bzr branch lp:~openstack-charmers/charms/trusty/cinder/next $distro/cinder
+bzr branch lp:~openstack-charmers/charms/trusty/cinder-ceph/next $distro/cinder-ceph
+bzr branch lp:~openstack-charmers/charms/trusty/glance/next $distro/glance
+bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
+bzr branch lp:~openstack-charmers/charms/trusty/keystone/next $distro/keystone
+bzr branch lp:~openstack-charmers/charms/trusty/percona-cluster/next $distro/percona-cluster
+bzr branch lp:~openstack-charmers/charms/trusty/neutron-api/next $distro/neutron-api
+bzr branch lp:~openstack-charmers/charms/trusty/neutron-gateway/next $distro/neutron-gateway
+bzr branch lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next $distro/neutron-openvswitch
+bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next $distro/nova-cloud-controller
+bzr branch lp:~openstack-charmers/charms/trusty/nova-compute/next $distro/nova-compute
+bzr branch lp:~openstack-charmers/charms/trusty/openstack-dashboard/next $distro/openstack-dashboard
+bzr branch lp:~openstack-charmers/charms/trusty/rabbitmq-server/next $distro/rabbitmq-server
+bzr branch lp:~openstack-charmers/charms/trusty/hacluster/next $distro/hacluster
+bzr branch lp:~openstack-charmers/charms/trusty/heat/next $distro/heat
+bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
+bzr branch lp:~openstack-charmers-next/charms/xenial/ntp/trunk $distro/ntp
 
 #controller specific charm
-bzr branch lp:~openstack-charmers/charms/$distro/odl-controller/next $distro/odl-controller
-bzr branch lp:~openstack-charmers/charms/$distro/neutron-api-odl/next $distro/neutron-api-odl
-bzr branch lp:~openstack-charmers/charms/$distro/openvswitch-odl/trunk $distro/openvswitch-odl
+bzr branch lp:~openstack-charmers/charms/trusty/odl-controller/next $distro/odl-controller
+bzr branch lp:~openstack-charmers/charms/trusty/neutron-api-odl/next $distro/neutron-api-odl
+bzr branch lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk $distro/openvswitch-odl
 
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 67fec0d2..7324224d 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -11,7 +11,7 @@ openstack-phase1:
       num_units: 2
       constraints: tags=compute
     ntp:
-      charm: "cs:trusty/ntp"
+      charm: "local:trusty/ntp"
   relations:
     - - "ntp:juju-info"
       - "nodes-api:juju-info"
@@ -82,7 +82,7 @@ openstack-phase2:
     ceilometer-agent:
       charm: "local:trusty/ceilometer-agent"
     mongodb:
-      charm: "cs:trusty/mongodb"
+      charm: "local:trusty/mongodb"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
@@ -244,7 +244,6 @@ openstack-phase2:
         - "lxc:nodes-api=2"
     opnfv-promise:
       branch: lp:~narindergupta/charms/trusty/promise/trunk
-      num_units: 1
       to:
         - "lxc:nodes-api=2"
     neutron-api-odl:
@@ -442,7 +441,7 @@ trusty-mitaka:
     #l2-population: true
     #ext-port: "eth1"
     region: Canonical
-    source: "cloud:trusty-mitaka"
+    #source: "cloud:trusty-mitaka"
     openstack-origin: "cloud:trusty-mitaka"
     series: trusty
     ceph-osd-replication-count: 2
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 9220f84f..dca43281 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -11,7 +11,7 @@ openstack-phase1:
       num_units: 2
       constraints: tags=compute
     ntp: 
-      charm: "cs:trusty/ntp"
+      charm: "local:trusty/ntp"
   relations:
     - - "ntp:juju-info"
       - "nodes-api:juju-info"
@@ -36,7 +36,7 @@ openstack-phase2:
     ceilometer-agent:
       charm: "local:trusty/ceilometer-agent"
     mongodb:
-      charm: "cs:trusty/mongodb"
+      charm: "local:trusty/mongodb"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
@@ -162,7 +162,6 @@ openstack-phase2:
         - "lxc:nodes-api=0"
     opnfv-promise:
       branch: lp:~narindergupta/charms/trusty/promise/trunk
-      num_units: 1
       to:
         - "lxc:nodes-api=0"
     neutron-api-odl:
@@ -279,7 +278,7 @@ trusty-mitaka:
     #l2-population: true
     #ext-port: "eth1"
     region: Canonical
-    source: "cloud:trusty-mitaka"
+    #source: "cloud:trusty-mitaka"
     openstack-origin: "cloud:trusty-mitaka"
     series: trusty
     ceph-osd-replication-count: 2
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 8c309c54..d9b71170 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -11,7 +11,7 @@ openstack-phase1:
       num_units: 2
       constraints: tags=compute
     ntp:
-      charm: "cs:trusty/ntp"
+      charm: "local:trusty/ntp"
   relations:
     - - "ntp:juju-info"
       - "nodes-api:juju-info"
@@ -36,7 +36,7 @@ openstack-phase2:
     ceilometer-agent:
       charm: "local:trusty/ceilometer-agent"
     mongodb:
-      charm: "cs:trusty/mongodb"
+      charm: "local:trusty/mongodb"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
@@ -164,7 +164,6 @@ openstack-phase2:
         - "lxc:nodes-api=0"
     opnfv-promise:
       branch: lp:~narindergupta/charms/trusty/promise/trunk
-      num_units: 1
       to:
         - "lxc:nodes-api=0"
     neutron-api-odl:
@@ -281,7 +280,7 @@ trusty-mitaka:
     #l2-population: true
     #ext-port: "eth1"
     region: Canonical
-    source: "cloud:trusty-mitaka"
+    #source: "cloud:trusty-mitaka"
     openstack-origin: "cloud:trusty-mitaka"
     series: trusty
     ceph-osd-replication-count: 2