From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 28 Sep 2016 20:53:01 +0000 (-0500)
Subject: cleanup the stalled files for D release.
X-Git-Tag: danube.1.0~156
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=41250ce50c222ad5d4c9e459be142de1e34ed575;p=joid.git

cleanup the stalled files for D release.

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

diff --git a/ci/nosdn/README b/ci/nosdn/README
deleted file mode 100644
index 765e5eb7..00000000
--- a/ci/nosdn/README
+++ /dev/null
@@ -1,87 +0,0 @@
-OpenDaylight Deployment with Juju
-=================================
-
-This readme contains instructions for checking out and deploying Juju charms for
-OpenDaylight.
-
-The charms are targetted at Trusty.
-
-
-Checkout charms
----------------
-
-Charms are hosted on Launchpad.
-You need to 'sudo apt-get install bzr' first.
-
-Follow these steps to checkout code:
-
-cd <deployer dir>
-./fetch-charms.sh
-
-This will checkout the relevant charms into 'src' and create any Juju symlinks
-in 'charms'.
-
-
-Deploy with cloud-sh-odl
-------------------------
-
-cloud-sh-odl is a collection of development shell scripts to deploy
-and setup OpenStack with OpenDaylight using Juju's local provider. This will
-create 3 KVMs as follows:
-
-*KVM #1 - Keystone, Glance, Neutron Server, Nova Cloud Controller, Horizon,
-          MySQL, RabbitMQ, OpenDaylight Controller
-
-*KVM #2 - Neutron agents
-
-*KVM #3 - Nova Compute
-
-You'll require approx. 13Gb RAM with 40Gb+ disk space.
-Deployment can take anywhere between 20 mins to 1 hour.
-
-You need to 'sudo apt-get install juju juju-local uvtool', and
-logout/login in order to pick up libvirt group permissions before
-proceeding. See https://bugs.launchpad.net/juju-core/+bug/1308088.
-
-Follow these steps:
-
-ssh-keygen
-  (if you don't already have a key at ~/.ssh/id_rsa).
-
-cp cloud-sh-odl/environments.yaml ~/.juju
-  (or create your own default local environment in your existing
-   environments.yaml file)
-
-cd cloud-sh-odl
-
-./deploy.sh
-
-This will log to 'out.log'.
-
-This will deploy OpenStack and import Trusty's daily image into Glance.
-
-Horizon will be located on the machine 'juju status openstack-dashboard' -
-http://<ip>/horizon.
-Admin credentials will be written to cloud/admin-openrc.
-
-The deployment can be destroyed with:
-
-juju destroy-environment local
-
-
-Deploy with Juju Deployer
--------------------------
-
-Juju Deployer can deploy a preset configuration of charms given a yaml
-configuration file. There is a configuration file in
-'juju-deployer/odl.yaml'.
-
-You need to 'sudo apt-get install juju-deployer' first.
-
-Then:
-
-cd juju-deployer
-
-juju-deployer -c odl.yaml -d trusty-icehouse-odl
-
-Juju Deployer will branch its own copy of the remote charms.
diff --git a/ci/nosdn/cloud-sh-odl/cloud-setup.sh b/ci/nosdn/cloud-sh-odl/cloud-setup.sh
deleted file mode 100755
index 2a0bc2a7..00000000
--- a/ci/nosdn/cloud-sh-odl/cloud-setup.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-. ~/admin-openrc
-
-# adjust tiny image
-nova flavor-delete m1.tiny
-nova flavor-create m1.tiny 1 512 8 1
-
-# import key pair
-nova keypair-add --pub-key id_rsa.pub ubuntu-keypair
diff --git a/ci/nosdn/cloud-sh-odl/compute.sh b/ci/nosdn/cloud-sh-odl/compute.sh
deleted file mode 100755
index eb818250..00000000
--- a/ci/nosdn/cloud-sh-odl/compute.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-modprobe kvm_intel
-printf "\n%s\n" kvm_intel >> /etc/modules
-service libvirt-bin restart
-
-sed -e 's/KSM_ENABLED=1/KSM_ENABLED=0/' -i /etc/default/qemu-kvm
-service qemu-kvm restart
diff --git a/ci/nosdn/cloud-sh-odl/config.sh b/ci/nosdn/cloud-sh-odl/config.sh
deleted file mode 100644
index 66932c58..00000000
--- a/ci/nosdn/cloud-sh-odl/config.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-export JUJU_REPOSITORY=../charms
-
-DEFAULT_SERIES=trusty
-
-CHARM_GLANCE=local:trusty/glance
-
-CHARM_KEYSTONE=local:trusty/keystone
-CHARM_KEYSTONE_DEPLOY_OPTS="--config config.yaml"
-
-CHARM_MYSQL=trusty/mysql
-CHARM_MYSQL_DEPLOY_OPTS="--config config.yaml"
-
-CHARM_NEUTRON_API=local:trusty/neutron-api
-CHARM_NEUTRON_API_DEPLOY_OPTS="--config config.yaml"
-
-CHARM_NEUTRON_GATEWAY=local:trusty/quantum-gateway
-CHARM_NEUTRON_GATEWAY_DEPLOY_OPTS="--config config.yaml"
-
-CHARM_NEUTRON_ODL=local:trusty/neutron-odl
-
-CHARM_NOVA_CLOUD_CONTROLLER=local:trusty/nova-cloud-controller
-CHARM_NOVA_CLOUD_CONTROLLER_DEPLOY_OPTS="--config config.yaml"
-
-CHARM_NOVA_COMPUTE=local:trusty/nova-compute
-
-CHARM_ODL_CONTROLLER=local:trusty/odl-controller
-
-CHARM_OPENSTACK_DASHBOARD=local:trusty/openstack-dashboard
-
-CHARM_RABBITMQ_SERVER=trusty/rabbitmq-server
diff --git a/ci/nosdn/cloud-sh-odl/config.yaml b/ci/nosdn/cloud-sh-odl/config.yaml
deleted file mode 100644
index 066171be..00000000
--- a/ci/nosdn/cloud-sh-odl/config.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-keystone:
-  admin-password: password
-
-mysql:
-  dataset-size: 10%
-  max-connections: 1000
-
-neutron-api:
-  neutron-plugin: odl
-  neutron-security-groups: True
-
-neutron-gateway:
-  instance-mtu: 1400
-  plugin: odl
-
-nova-cloud-controller:
-  network-manager: Neutron
-  quantum-security-groups: "yes"
diff --git a/ci/nosdn/cloud-sh-odl/deploy.sh b/ci/nosdn/cloud-sh-odl/deploy.sh
deleted file mode 100755
index b0a63b6b..00000000
--- a/ci/nosdn/cloud-sh-odl/deploy.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh -e
-exec ./openstack.sh ./config.sh 2>&1 | tee out.log
diff --git a/ci/nosdn/cloud-sh-odl/environments.yaml b/ci/nosdn/cloud-sh-odl/environments.yaml
deleted file mode 100644
index 72a492d3..00000000
--- a/ci/nosdn/cloud-sh-odl/environments.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-default: local
-
-environments:
-  local:
-    type: local
-    container: kvm
-    default-series: trusty
-    lxc-clone: true
diff --git a/ci/nosdn/cloud-sh-odl/glance.sh b/ci/nosdn/cloud-sh-odl/glance.sh
deleted file mode 100755
index 467932ff..00000000
--- a/ci/nosdn/cloud-sh-odl/glance.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-. ~/admin-openrc
-
-wget http://cloud-images.ubuntu.com/trusty/current/MD5SUMS
-
-wget http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
-glance image-create --name ubuntu-trusty-daily --disk-format qcow2 --container-format bare --owner admin --file trusty-server-cloudimg-amd64-disk1.img --checksum $(grep trusty-server-cloudimg-amd64-disk1.img MD5SUMS | cut -d " " -f 1) --is-public True
diff --git a/ci/nosdn/cloud-sh-odl/lxc-network.sh b/ci/nosdn/cloud-sh-odl/lxc-network.sh
deleted file mode 100755
index 5a65fa18..00000000
--- a/ci/nosdn/cloud-sh-odl/lxc-network.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-DEBIAN_FRONTEND=noninteractive apt-get -qy -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold install lxc < /dev/null
-
-sed -e 's/^USE_LXC_BRIDGE="true"/USE_LXC_BRIDGE="false"/' -i /etc/default/lxc
-service lxc-net restart
-
-ifdown eth0
-mv /etc/network/interfaces.d/eth0.cfg /etc/network/interfaces.d/eth0.cfg.bak
-cat <<-"EOF" > /etc/network/interfaces.d/bridge.cfg
-	auto eth0
-	iface eth0 inet manual
-
-	auto lxcbr0
-	iface lxcbr0 inet dhcp
-	    bridge_ports eth0
-	EOF
-ifup eth0 lxcbr0
diff --git a/ci/nosdn/cloud-sh-odl/openstack.sh b/ci/nosdn/cloud-sh-odl/openstack.sh
deleted file mode 100755
index 9da2cfb5..00000000
--- a/ci/nosdn/cloud-sh-odl/openstack.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/sh -ex
-
-agentState()
-{
-	juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"machines\"][\"$1\"][\"agent-state\"]" 2> /dev/null
-}
-
-agentStateUnit()
-{
-	juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"agent-state\"]" 2> /dev/null
-}
-
-configOpenrc()
-{
-	cat <<-EOF
-		export OS_USERNAME=$1
-		export OS_PASSWORD=$2
-		export OS_TENANT_NAME=$3
-		export OS_AUTH_URL=$4
-		export OS_REGION_NAME=$5
-		EOF
-}
-
-unitAddress()
-{
-	juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null
-}
-
-unitMachine()
-{
-	juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
-}
-
-waitForMachine()
-{
-	for machine; do
-		while [ "$(agentState $machine)" != started ]; do
-			sleep 5
-		done
-	done
-}
-
-waitForService()
-{
-	for service; do
-		while [ "$(agentStateUnit "$service" 0)" != started ]; do
-			sleep 5
-		done
-	done
-}
-
-if [ $# -ne 0 ]; then
-	. "$1"
-fi
-
-juju bootstrap
-waitForMachine 0
-
-spare_cpus=$(($(grep processor /proc/cpuinfo | wc -l) - 5))
-if [ $spare_cpus -gt 0 ]; then
-	spare_cpus=$(((spare_cpus * 3) / 4))
-else
-	spare_cpus=0
-fi
-
-extra_cpus=0
-[ $spare_cpus -ne 0 ] && extra_cpus=$((1 + (((spare_cpus - 1) * 3) / 4))) && spare_cpus=$((spare_cpus - extra_cpus))
-juju add-machine --constraints "cpu-cores=$((1 + extra_cpus)) mem=8G root-disk=20G" --series $DEFAULT_SERIES
-
-juju deploy --constraints mem=1G $CHARM_NEUTRON_GATEWAY_DEPLOY_OPTS "${CHARM_NEUTRON_GATEWAY:-quantum-gateway}" neutron-gateway
-
-juju deploy --constraints "cpu-cores=$((1 + spare_cpus)) mem=4G root-disk=20G" $CHARM_NOVA_COMPUTE_DEPLOY_OPTS "${CHARM_NOVA_COMPUTE:-nova-compute}"
-
-waitForMachine 1
-juju scp lxc-network.sh 1:
-juju run --machine 1 "sudo ./lxc-network.sh"
-juju deploy --to lxc:1 $CHARM_MYSQL_DEPLOY_OPTS "${CHARM_MYSQL:-mysql}"
-juju deploy --to lxc:1 $CHARM_RABBITMQ_SERVER_DEPLOY_OPTS "${CHARM_RABBITMQ_SERVER:-rabbitmq-server}"
-juju deploy --to lxc:1 $CHARM_KEYSTONE_DEPLOY_OPTS "${CHARM_KEYSTONE:-keystone}"
-juju deploy --to lxc:1 $CHARM_NOVA_CLOUD_CONTROLLER_DEPLOY_OPTS "${CHARM_NOVA_CLOUD_CONTROLLER:-nova-cloud-controller}"
-juju deploy --to lxc:1 $CHARM_NEUTRON_API_DEPLOY_OPTS "${CHARM_NEUTRON_API:-neutron-api}"
-juju deploy --to lxc:1 $CHARM_GLANCE_DEPLOY_OPTS "${CHARM_GLANCE:-glance}"
-juju deploy --to lxc:1 $CHARM_OPENSTACK_DASHBOARD_DEPLOY_OPTS "${CHARM_OPENSTACK_DASHBOARD:-openstack-dashboard}"
-# opendaylight
-juju deploy --to lxc:1 $CHARM_ODL_CONTROLLER_DEPLOY_OPTS "${CHARM_ODL_CONTROLLER:-odl-controller}"
-juju deploy $CHARM_NEUTRON_ODL_DEPLOY_OPTS "${CHARM_NEUTRON_ODL:-neutron-odl}"
-
-# relation must be set first
-# no official way of knowing when this relation hook will fire
-waitForService mysql keystone
-juju add-relation keystone mysql
-sleep 60
-
-waitForService rabbitmq-server nova-cloud-controller glance
-juju add-relation nova-cloud-controller mysql
-juju add-relation nova-cloud-controller rabbitmq-server
-juju add-relation nova-cloud-controller glance
-juju add-relation nova-cloud-controller keystone
-sleep 60
-
-waitForService neutron-api
-juju add-relation neutron-api mysql
-juju add-relation neutron-api rabbitmq-server
-juju add-relation neutron-api keystone
-juju add-relation neutron-api nova-cloud-controller
-sleep 60
-
-waitForService openstack-dashboard neutron-gateway nova-compute
-juju add-relation neutron-gateway mysql
-juju add-relation neutron-gateway:amqp rabbitmq-server:amqp
-juju add-relation neutron-gateway nova-cloud-controller
-juju add-relation neutron-gateway neutron-api
-juju add-relation nova-compute:shared-db mysql:shared-db
-juju add-relation nova-compute:amqp rabbitmq-server:amqp
-juju add-relation nova-compute glance
-juju add-relation nova-compute nova-cloud-controller
-juju add-relation glance mysql
-juju add-relation glance keystone
-juju add-relation openstack-dashboard keystone
-sleep 60
-
-# opendaylight
-waitForService odl-controller
-juju add-relation neutron-api odl-controller
-juju add-relation neutron-gateway odl-controller
-juju add-relation nova-compute neutron-odl
-juju add-relation neutron-odl odl-controller
-sleep 60
-
-# enable kvm on compute
-machine=$(unitMachine nova-compute 0)
-juju scp compute.sh $machine:
-juju run --machine $machine "sudo ./compute.sh"
-
-mkdir -m 0700 -p cloud
-controller_address=$(unitAddress keystone 0)
-configOpenrc admin password Admin http://$controller_address:5000/v2.0 RegionOne > cloud/admin-openrc
-chmod 0600 cloud/admin-openrc
-
-machine=$(unitMachine nova-cloud-controller 0)
-juju scp cloud-setup.sh cloud/admin-openrc ~/.ssh/id_rsa.pub $machine:
-juju run --machine $machine ./cloud-setup.sh
-
-machine=$(unitMachine glance 0)
-juju scp glance.sh cloud/admin-openrc $machine:
-juju run --machine $machine ./glance.sh
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 05fa705d..278f0c5d 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -16,30 +16,30 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build congress
-git clone -b stable/16.07 https://github.com/openstack/charm-aodh.git $distro/charm-aodh
+git clone https://github.com/openstack/charm-aodh.git $distro/charm-aodh
 build aodh
 
-git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster
-git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone -b stable/16.07 https://github.com/openstack/charm-ceph.git $distro/ceph
-#git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
-git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone -b stable/16.07 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
-git clone -b stable/16.07 https://github.com/openstack/charm-cinder.git $distro/cinder
-git clone -b stable/16.07 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-git clone -b stable/16.07 https://github.com/openstack/charm-glance.git $distro/glance
-git clone -b stable/16.07 https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone -b stable/16.07 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
-git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
-git clone -b stable/16.07 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
-git clone -b stable/16.07 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
-git clone -b stable/16.07 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
-git clone -b stable/16.07 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
-git clone -b stable/16.07 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-git clone -b stable/16.07 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-git clone -b stable/16.07 https://github.com/openstack/charm-heat.git $distro/heat
-git clone -b stable/16.07 https://github.com/openstack/charm-lxd.git xenial/lxd
+git clone  https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone  https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone  https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone  https://github.com/openstack/charm-ceph.git $distro/ceph
+#git clone  https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
+git clone  https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone  https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone  https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone  https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone  https://github.com/openstack/charm-glance.git $distro/glance
+git clone  https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone  https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone  https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone  https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
+git clone  https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone  https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone  https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone  https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone  https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone  https://github.com/openstack/charm-heat.git $distro/heat
+git clone  https://github.com/openstack/charm-lxd.git xenial/lxd
 
 charm pull cs:~free.ekanayaka/xenial/haproxy-1 $distro/haproxy
 #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
deleted file mode 100644
index 2112ab94..00000000
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ /dev/null
@@ -1,387 +0,0 @@
-# vim: set ts=2 et:
-trusty-mitaka-nodes:
-  inherits: openstack-phase1
-  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
-    region: Canonical
-    #source: "cloud:trusty-mitaka"
-    openstack-origin: "cloud:trusty-mitaka"
-    #ceph-osd-replication-count: 2
-    admin-role: admin
-    keystone-admin-role: admin
-    #use-internal-endpoints: true
-    #os-public-hostname: pod.maas
-
-trusty-mitaka:
-  inherits: openstack-phase2
-
-openstack-phase1:
-  services:
-    nodes:
-      charm: "cs:trusty/ubuntu"
-      num_units: 5
-    ntp:
-      charm: "local:trusty/ntp"
-    neutron-gateway:
-      charm: "local:trusty/neutron-gateway"
-      options:
-        #ext-port: "eth1"
-        instance-mtu: 1400
-      to:
-        - "nodes=0"
-    nova-cloud-controller:
-      charm: "local:trusty/nova-cloud-controller"
-      num_units: 3
-      options:
-        console-access-protocol: novnc
-        #console-proxy-ip: pod.maas
-        network-manager: Neutron
-        #service-guard: true
-        vip: 10.4.1.16
-      to:
-        - "lxc:nodes=2"
-        - "lxc:nodes=3"
-        - "lxc:nodes=4"
-    nova-compute:
-      charm: "local:trusty/nova-compute"
-      num_units: 4
-      options:
-        enable-live-migration: true
-        enable-resize: true
-        manage-neutron-plugin-legacy-mode: false
-        migration-auth-type: ssh
-        #hugepages: "50%"
-        #virt-type: lxd
-      to:
-        - "nodes=1"
-        - "nodes=2"
-        - "nodes=3"
-        - "nodes=4"
-    openstack-dashboard:
-      charm: "local:trusty/openstack-dashboard"
-      num_units: 3
-      options:
-        secret: admin
-        webroot: /
-        vip: 10.4.1.11
-        #endpoint-type: internalURL
-      to:
-        - "lxc:nodes=3"
-        - "lxc:nodes=4"
-        - "lxc:nodes=0"
-    rabbitmq-server:
-      charm: "local:trusty/rabbitmq-server"
-      num_units: 3
-      options:
-        vip: 10.4.1.10
-      to:
-        - "lxc:nodes=4"
-        - "lxc:nodes=0"
-        - "lxc:nodes=1"
-    heat:
-      charm: "local:trusty/heat"
-      num_units: 3
-      options:
-        vip: 10.4.1.18
-      to:
-        - "lxc:nodes=2"
-        - "lxc:nodes=3"
-        - "lxc:nodes=4"
-    congress:
-      charm: local:trusty/congress
-      options:
-        #source-branch: stable/mitaka
-      to:
-        - "lxc:nodes=0"
-    glance:
-      charm: "local:trusty/glance"
-      num_units: 3
-      options:
-        vip: 10.4.1.12
-      to:
-        - "lxc:nodes=3"
-        - "lxc:nodes=4"
-        - "lxc:nodes=0"
-    opnfv-promise:
-      charm: local:trusty/promise
-      to:
-        - "lxc:nodes=0"
-    keystone:
-      charm: "local:trusty/keystone"
-      num_units: 3
-      options:
-        admin-password: openstack
-        admin-token: admin
-        vip: 10.4.1.13
-      to:
-        - "lxc:nodes=4"
-        - "lxc:nodes=0"
-        - "lxc:nodes=1"
-    mongodb:
-      charm: local:trusty/mongodb
-      to:
-        - "lxc:nodes=0"
-    mysql:
-      charm: "local:trusty/percona-cluster"
-      num_units: 3
-      options:
-        dataset-size: 2G
-        max-connections: 20000
-        lp1366997-workaround: true
-        root-password: 293rhc395m
-        sst-password: 127rc14t51
-        vip: 10.4.1.15
-      to:
-        - "lxc:nodes=0"
-        - "lxc:nodes=1"
-        - "lxc:nodes=2"
-    neutron-api:
-      charm: "local:trusty/neutron-api"
-      num_units: 3
-      options:
-        neutron-security-groups: true
-        overlay-network-type: vxlan
-        #flat-network-providers: "*"
-        vip: 10.4.1.17
-      to:
-        - "lxc:nodes=1"
-        - "lxc:nodes=2"
-        - "lxc:nodes=3"
-    ceph:
-      charm: "local:trusty/ceph"
-      num_units: 3
-      options:
-        monitor-count: 3
-        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-#        osd-reformat: 'yes'
-#        ceph-cluster-network: 192.168.0.0/24
-#        ceph-public-network: 192.168.0.0/24
-      to:
-        - "lxc:nodes=1"
-        - "lxc:nodes=2"
-        - "lxc:nodes=3"
-    ceph-osd:
-      charm: "local:trusty/ceph-osd"
-      num_units: 3
-      options:
-        osd-devices: /srv
-        osd-reformat: 'yes'
-      to:
-        - "nodes=2"
-        - "nodes=3"
-        - "nodes=4"
-    ceph-radosgw:
-      charm: "local:trusty/ceph-radosgw"
-      options:
-        use-embedded-webserver: true
-        operator-roles: "Member,admin"
-      to:
-        - "lxc:nodes=0"
-    cinder:
-      charm: "local:trusty/cinder"
-      num_units: 3
-      options:
-        block-device: None
-        glance-api-version: 2
-        vip: 10.4.1.19
-      to:
-        - "lxc:nodes=2"
-        - "lxc:nodes=3"
-        - "lxc:nodes=4"
-    ceilometer:
-      charm: "local:trusty/ceilometer"
-      num_units: 3
-      options:
-        vip: 10.4.1.14
-      to:
-        - "lxc:nodes=0"
-        - "lxc:nodes=1"
-        - "lxc:nodes=2"
-    hacluster-keystone:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-cinder:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-heat:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-horizon:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-ceilometer:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-nova:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-neutron:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-glance:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-mysql:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-
-  relations:
-    - - ntp:juju-info
-      - nodes:juju-info
-    - - mysql:ha
-      - hacluster-mysql:ha
-    - - glance:ha
-      - hacluster-glance:ha
-    - - keystone:ha
-      - hacluster-keystone:ha
-    - - neutron-api:ha
-      - hacluster-neutron:ha
-    - - nova-cloud-controller:ha
-      - hacluster-nova:ha
-    - - openstack-dashboard:ha
-      - hacluster-horizon:ha
-    - - ceilometer:ha
-      - hacluster-ceilometer:ha
-    - - cinder:ha
-      - hacluster-cinder:ha
-    - - heat:ha
-      - hacluster-heat:ha
-
-openstack-phase2:
-  inherits: openstack-phase1
-  relations:
-    - - nova-compute:amqp
-      - rabbitmq-server:amqp
-    - - neutron-gateway:amqp
-      - rabbitmq-server:amqp
-    - - keystone:shared-db
-      - mysql:shared-db
-    - - nova-cloud-controller:identity-service
-      - keystone:identity-service
-    - - glance:identity-service
-      - keystone:identity-service
-    - - neutron-api:identity-service
-      - keystone:identity-service
-    - - neutron-openvswitch:neutron-plugin-api
-      - neutron-api:neutron-plugin-api
-    - - neutron-api:shared-db
-      - mysql:shared-db
-    - - neutron-api:amqp
-      - rabbitmq-server:amqp
-    - - neutron-gateway:neutron-plugin-api
-      - neutron-api:neutron-plugin-api
-    - - glance:shared-db
-      - mysql:shared-db
-    - - glance:amqp
-      - rabbitmq-server:amqp
-    - - nova-cloud-controller:image-service
-      - glance:image-service
-    - - nova-compute:image-service
-      - glance:image-service
-    - - nova-cloud-controller:cloud-compute
-      - nova-compute:cloud-compute
-    - - nova-cloud-controller:amqp
-      - rabbitmq-server:amqp
-    - - nova-cloud-controller:quantum-network-service
-      - neutron-gateway:quantum-network-service
-    - - nova-compute:neutron-plugin
-      - neutron-openvswitch:neutron-plugin
-    - - neutron-openvswitch:amqp
-      - rabbitmq-server:amqp
-    - - openstack-dashboard:identity-service
-      - keystone:identity-service
-    - - nova-cloud-controller:shared-db
-      - mysql:shared-db
-    - - nova-cloud-controller:neutron-api
-      - neutron-api:neutron-api
-    - - cinder:image-service
-      - glance:image-service
-    - - cinder:amqp
-      - rabbitmq-server:amqp
-    - - cinder:identity-service
-      - keystone:identity-service
-    - - cinder:cinder-volume-service
-      - nova-cloud-controller:cinder-volume-service
-    - - cinder-ceph:storage-backend
-      - cinder:storage-backend
-    - - ceph:client
-      - nova-compute:ceph
-    - - cinder:shared-db
-      - mysql:shared-db
-    - - ceph:client
-      - cinder-ceph:ceph
-    - - ceph:client
-      - glance:ceph
-    - - ceph-osd:mon
-      - ceph:osd
-    - - ntp:juju-info
-      - nova-compute:juju-info
-    - - ntp:juju-info
-      - neutron-gateway:juju-info
-    - - ceph-radosgw:mon
-      - ceph:radosgw
-    - - ceph-radosgw:identity-service
-      - keystone:identity-service
-    - - ceilometer:amqp
-      - rabbitmq-server:amqp
-    - - ceilometer-agent:ceilometer-service
-      - ceilometer:ceilometer-service
-    - - ceilometer:identity-service
-      - keystone:identity-service
-    - - ceilometer:identity-notifications
-      - keystone:identity-notifications
-    - - ceilometer-agent:nova-ceilometer
-      - nova-compute:nova-ceilometer
-    - - ceilometer:shared-db
-      - mongodb:database
-    - - heat:shared-db
-      - mysql:shared-db
-    - - heat:identity-service
-      - keystone:identity-service
-    - - heat:amqp
-      - rabbitmq-server:amqp
-    #- - nova-compute:lxd
-      #- lxd:lxd
-    - - congress:shared-db
-      - mysql:shared-db
-    - - congress:identity-service
-      - keystone:identity-service
-    - - congress:amqp
-      - rabbitmq-server:amqp
-
-  services:
-    ceilometer-agent:
-      charm: "local:trusty/ceilometer-agent"
-    cinder-ceph:
-      charm: "local:trusty/cinder-ceph"
-    neutron-openvswitch:
-      charm: "local:trusty/neutron-openvswitch"
-      options:
-        #enable-dpdk: true
-        #data-port: ""
-        #default-socket-memory: 1024
-        #defualt-socket-cores: 1
-        #dpdk-driver: uio_pci_generic
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
deleted file mode 100644
index de7f7547..00000000
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ /dev/null
@@ -1,263 +0,0 @@
-# vim: set ts=2 et:
-trusty-mitaka-nodes:
-  inherits: openstack-phase1
-
-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
-    region: Canonical
-    #source: "cloud:trusty-mitaka"
-    openstack-origin: "cloud:trusty-mitaka"
-    ceph-osd-replication-count: 2
-    admin-role: admin
-    keystone-admin-role: admin
-
-openstack-phase1:
-  services:
-    nodes:
-      charm: "cs:trusty/ubuntu"
-      num_units: 2
-    ntp:
-      charm: "local:trusty/ntp"
-  relations:
-    - - "ntp:juju-info"
-      - "nodes:juju-info"
-
-openstack-phase2:
-  inherits: openstack-phase1
-  relations:
-    - - nova-compute:amqp
-      - rabbitmq-server:amqp
-    - - neutron-gateway:amqp
-      - rabbitmq-server:amqp
-    - - keystone:shared-db
-      - mysql:shared-db
-    - - nova-cloud-controller:identity-service
-      - keystone:identity-service
-    - - glance:identity-service
-      - keystone:identity-service
-    - - neutron-api:identity-service
-      - keystone:identity-service
-    - - neutron-openvswitch:neutron-plugin-api
-      - neutron-api:neutron-plugin-api
-    - - neutron-api:shared-db
-      - mysql:shared-db
-    - - neutron-api:amqp
-      - rabbitmq-server:amqp
-    - - neutron-gateway:neutron-plugin-api
-      - neutron-api:neutron-plugin-api
-    - - glance:shared-db
-      - mysql:shared-db
-    - - glance:amqp
-      - rabbitmq-server:amqp
-    - - nova-cloud-controller:image-service
-      - glance:image-service
-    - - nova-compute:image-service
-      - glance:image-service
-    - - nova-cloud-controller:cloud-compute
-      - nova-compute:cloud-compute
-    - - nova-cloud-controller:amqp
-      - rabbitmq-server:amqp
-    - - nova-cloud-controller:quantum-network-service
-      - neutron-gateway:quantum-network-service
-    - - nova-compute:neutron-plugin
-      - neutron-openvswitch:neutron-plugin
-    - - neutron-openvswitch:amqp
-      - rabbitmq-server:amqp
-    - - openstack-dashboard:identity-service
-      - keystone:identity-service
-    - - nova-cloud-controller:shared-db
-      - mysql:shared-db
-    - - nova-cloud-controller:neutron-api
-      - neutron-api:neutron-api
-    - - cinder:image-service
-      - glance:image-service
-    - - cinder:amqp
-      - rabbitmq-server:amqp
-    - - cinder:identity-service
-      - keystone:identity-service
-    - - cinder:cinder-volume-service
-      - nova-cloud-controller:cinder-volume-service
-    - - cinder-ceph:storage-backend
-      - cinder:storage-backend
-    - - ceph:client
-      - nova-compute:ceph
-    - - cinder:shared-db
-      - mysql:shared-db
-    - - ceph:client
-      - cinder-ceph:ceph
-    - - ceph:client
-      - glance:ceph
-    - - ceph-osd:mon
-      - ceph:osd
-    - - ntp:juju-info
-      - nova-compute:juju-info
-    - - ntp:juju-info
-      - neutron-gateway:juju-info
-    - - ceph-radosgw:mon
-      - ceph:radosgw
-    - - ceph-radosgw:identity-service
-      - keystone:identity-service
-    - - ceilometer:amqp
-      - rabbitmq-server:amqp
-    - - ceilometer-agent:ceilometer-service
-      - ceilometer:ceilometer-service
-    - - ceilometer:identity-service
-      - keystone:identity-service
-    - - ceilometer:identity-notifications
-      - keystone:identity-notifications
-    - - ceilometer-agent:nova-ceilometer
-      - nova-compute:nova-ceilometer
-    - - ceilometer:shared-db
-      - mongodb:database
-    - - heat:shared-db
-      - mysql:shared-db
-    - - heat:identity-service
-      - keystone:identity-service
-    - - heat:amqp
-      - rabbitmq-server:amqp
-    #- - nova-compute:lxd
-      #- lxd:lxd
-    - - congress:shared-db
-      - mysql:shared-db
-    - - congress:identity-service
-      - keystone:identity-service
-    - - congress:amqp
-      - rabbitmq-server:amqp
-  services:
-    ceilometer:
-      charm: "local:trusty/ceilometer"
-      to:
-        - "lxc:nodes=0"
-    ceilometer-agent:
-      charm: "local:trusty/ceilometer-agent"
-    ceph:
-      charm: "local:trusty/ceph"
-      num_units: 2
-      options:
-        monitor-count: 2
-        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-#        osd-reformat: 'yes'
-#        ceph-cluster-network: 192.168.0.0/24
-#        ceph-public-network: 192.168.0.0/24
-      to:
-        - "lxc:nodes=1"
-        - "lxc:nodes=0"
-    ceph-osd:
-      charm: "local:trusty/ceph-osd"
-      num_units: 2
-      options:
-        osd-devices: /srv
-        osd-reformat: 'yes'
-      to:
-        - "nodes=0"
-        - "nodes=1"
-    ceph-radosgw:
-      charm: "local:trusty/ceph-radosgw"
-      options:
-        use-embedded-webserver: true
-        operator-roles: "Member,admin"
-      to:
-        - "lxc:nodes=0"
-    cinder:
-      charm: "local:trusty/cinder"
-      options:
-        block-device: None
-        glance-api-version: 2
-      to:
-        - "lxc:nodes=1"
-    cinder-ceph:
-      charm: "local:trusty/cinder-ceph"
-    glance:
-      charm: "local:trusty/glance"
-      options:
-      to:
-        - "lxc:nodes=0"
-    opnfv-promise:
-      charm: local:trusty/promise
-      to:
-        - "lxc:nodes=1"
-    keystone:
-      charm: "local:trusty/keystone"
-      options:
-        admin-password: openstack
-        admin-token: admin
-      to:
-        - "lxc:nodes=0"
-    mongodb:
-      charm: local:trusty/mongodb
-      to:
-        - "lxc:nodes=1"
-    mysql:
-      charm: "local:trusty/percona-cluster"
-      options:
-        max-connections: 20000
-      to:
-        - "lxc:nodes=0"
-    neutron-api:
-      charm: "local:trusty/neutron-api"
-      options:
-        neutron-security-groups: true
-        #flat-network-providers: "*"
-        overlay-network-type: vxlan
-      to:
-        - "lxc:nodes=1"
-    neutron-gateway:
-      charm: "local:trusty/neutron-gateway"
-      options:
-        instance-mtu: 1400
-        #ext-port: "eth1"
-      to:
-        - "nodes=0"
-    neutron-openvswitch:
-      charm: "local:trusty/neutron-openvswitch"
-      options:
-        #enable-dpdk: true
-        #data-port: ""
-        #default-socket-memory: 1024
-        #defualt-socket-cores: 1
-        #dpdk-driver: uio_pci_generic
-    nova-cloud-controller:
-      charm: "local:trusty/nova-cloud-controller"
-      options:
-        network-manager: Neutron
-      to:
-        - "lxc:nodes=1"
-    nova-compute:
-      charm: "local:trusty/nova-compute"
-      options:
-        enable-live-migration: true
-        enable-resize: true
-        manage-neutron-plugin-legacy-mode: false
-        migration-auth-type: ssh
-        #hugepages: "50%"
-        #virt-type: lxd
-      to:
-        - "nodes=1"
-    openstack-dashboard:
-      charm: "local:trusty/openstack-dashboard"
-      options:
-        secret: admin
-        webroot: /
-      to:
-        - "lxc:nodes=0"
-    rabbitmq-server:
-      charm: "local:trusty/rabbitmq-server"
-      to:
-        - "lxc:nodes=1"
-    heat:
-      charm: "local:trusty/heat"
-      to:
-        - "lxc:nodes=0"
-    congress:
-      charm: local:trusty/congress
-      options:
-        #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
deleted file mode 100644
index 8519334e..00000000
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ /dev/null
@@ -1,268 +0,0 @@
-# vim: set ts=2 et:
-trusty-mitaka-nodes:
-  inherits: openstack-phase1
-
-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
-    region: Canonical
-    #source: "cloud:trusty-mitaka"
-    openstack-origin: "cloud:trusty-mitaka"
-    ceph-osd-replication-count: 2
-    admin-role: admin
-    keystone-admin-role: admin
-
-openstack-phase1:
-  services:
-    nodes:
-      charm: "cs:trusty/ubuntu"
-      num_units: 2
-    ntp:
-      charm: "local:trusty/ntp"
-  relations:
-    - - "ntp:juju-info"
-      - "nodes:juju-info"
-
-openstack-phase2:
-  inherits: openstack-phase1
-  relations:
-    - - neutron-openvswitch:neutron-plugin-api
-      - neutron-api:neutron-plugin-api
-    - - nova-compute:neutron-plugin
-      - neutron-openvswitch:neutron-plugin
-    - - neutron-openvswitch:amqp
-      - rabbitmq-server:amqp
-    - - "keystone:shared-db"
-      - "mysql:shared-db"
-    - - "nova-cloud-controller:shared-db"
-      - "mysql:shared-db"
-    - - "nova-cloud-controller:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-cloud-controller:image-service"
-      - "glance:image-service"
-    - - "nova-cloud-controller:identity-service"
-      - "keystone:identity-service"
-    - - "nova-cloud-controller:cloud-compute"
-      - "nova-compute:cloud-compute"
-    - - "nova-compute:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-compute:image-service"
-      - "glance:image-service"
-    - - "glance:shared-db"
-      - "mysql:shared-db"
-    - - "glance:identity-service"
-      - "keystone:identity-service"
-    - - "glance:amqp"
-      - "rabbitmq-server:amqp"
-    - - "openstack-dashboard:identity-service"
-      - "keystone:identity-service"
-    - - "neutron-api:shared-db"
-      - "mysql:shared-db"
-    - - "neutron-api:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-cloud-controller:neutron-api"
-      - "neutron-api:neutron-api"
-    - - "neutron-api:identity-service"
-      - "keystone:identity-service"
-    - - "neutron-gateway:amqp"
-      - "rabbitmq-server:amqp"
-    - - "neutron-gateway:neutron-plugin-api"
-      - "neutron-api:neutron-plugin-api"
-    - - "nova-cloud-controller:quantum-network-service"
-      - "neutron-gateway:quantum-network-service"
-    - - "ceilometer:amqp"
-      - "rabbitmq-server:amqp"
-    - - "ceilometer-agent:ceilometer-service"
-      - "ceilometer:ceilometer-service"
-    - - "ceilometer:identity-service"
-      - "keystone:identity-service"
-    - - "ceilometer:identity-notifications"
-      - "keystone:identity-notifications"
-    - - "ceilometer-agent:nova-ceilometer"
-      - "nova-compute:nova-ceilometer"
-    - - "ceilometer:shared-db"
-      - "mongodb:database"
-    - - "heat:shared-db"
-      - "mysql:shared-db"
-    - - "heat:identity-service"
-      - "keystone:identity-service"
-    - - "heat:amqp"
-      - "rabbitmq-server:amqp"
-    - - "cinder:image-service"
-      - "glance:image-service"
-    - - "cinder:amqp"
-      - "rabbitmq-server:amqp"
-    - - "cinder:identity-service"
-      - "keystone:identity-service"
-    - - "cinder:cinder-volume-service"
-      - "nova-cloud-controller:cinder-volume-service"
-    - - "cinder-ceph:storage-backend"
-      - "cinder:storage-backend"
-    - - "ceph:client"
-      - "nova-compute:ceph"
-    - - "cinder:shared-db"
-      - "mysql:shared-db"
-    - - "ceph:client"
-      - "cinder-ceph:ceph"
-    - - "ceph:client"
-      - "glance:ceph"
-    - - "ceph-osd:mon"
-      - "ceph:osd"
-    - - "ceph-radosgw:mon"
-      - "ceph:radosgw"
-    - - "ceph-radosgw:identity-service"
-      - "keystone:identity-service"
-    #- - nova-compute:lxd
-      #- lxd:lxd
-    - - congress:shared-db
-      - mysql:shared-db
-    - - congress:identity-service
-      - keystone:identity-service
-    - - congress:amqp
-      - rabbitmq-server:amqp
-  services:
-    mysql:
-      charm: "local:trusty/percona-cluster"
-      options:
-        dataset-size: 2G
-        max-connections: 10000
-      to:
-        - "lxc:nodes=0"
-    ceilometer:
-      charm: "local:trusty/ceilometer"
-      to:
-        - "lxc:nodes=1"
-    ceilometer-agent:
-      charm: "local:trusty/ceilometer-agent"
-    mongodb:
-      charm: "local:trusty/mongodb"
-      to:
-        - "lxc:nodes=0"
-    heat:
-      charm: "local:trusty/heat"
-      to:
-        - "lxc:nodes=1"
-    ceph:
-      charm: "local:trusty/ceph"
-      num_units: 2
-      options:
-        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        monitor-count: 2
-#        osd-reformat: 'no'
-#        ceph-cluster-network: 192.168.0.0/24
-#        ceph-public-network: 192.168.0.0/24
-      to:
-        - "lxc:nodes=0"
-        - "lxc:nodes=1"
-    ceph-osd:
-      charm: "local:trusty/ceph-osd"
-      num_units: 2
-      options:
-        osd-devices: /srv
-        osd-reformat: 'yes'
-      to:
-        - "nodes=0"
-        - "nodes=1"
-    ceph-radosgw:
-      charm: "local:trusty/ceph-radosgw"
-      options:
-        use-embedded-webserver: true
-        operator-roles: "Member,admin"
-      to:
-        - "lxc:nodes=0"
-    cinder:
-      charm: "local:trusty/cinder"
-      options:
-        block-device: None
-        glance-api-version: 2
-#        openstack-origin-git: include-file://cinder-master.yaml
-      to:
-        - "lxc:nodes=1"
-    cinder-ceph:
-      charm: "local:trusty/cinder-ceph"
-    rabbitmq-server:
-      charm: "local:trusty/rabbitmq-server"
-      to:
-        - "lxc:nodes=0"
-    keystone:
-      charm: "local:trusty/keystone"
-      options:
-        openstack-origin-git: include-file://keystone-master.yaml
-        admin-password: openstack
-        admin-token: admin
-      to:
-        - "lxc:nodes=1"
-    openstack-dashboard:
-      charm: "local:trusty/openstack-dashboard"
-      options:
-        openstack-origin-git: include-file://horizon-master.yaml
-        secret: admin
-      to:
-        - "lxc:nodes=0"
-    nova-compute:
-      charm: local:trusty/nova-compute
-      options:
-        openstack-origin-git: include-file://nova-master.yaml
-        enable-live-migration: true
-        enable-resize: true
-        manage-neutron-plugin-legacy-mode: false
-        migration-auth-type: ssh
-        #hugepages: "50%"
-        #virt-type: lxd
-      to:
-        - "nodes=1"
-    nova-cloud-controller:
-      charm: "local:trusty/nova-cloud-controller"
-      options:
-        openstack-origin-git: include-file://nova-master.yaml
-        console-access-protocol: novnc
-        network-manager: Neutron
-      to:
-        - "lxc:nodes=1"
-    neutron-api:
-      charm: local:charms/trusty/neutron-api
-      options:
-        neutron-security-groups: True
-        overlay-network-type: vxlan
-        #flat-network-providers: "*"
-      to:
-        - "lxc:nodes=0"
-    neutron-gateway:
-      charm: "local:trusty/neutron-gateway"
-      options:
-        openstack-origin-git: include-file://neutron-master.yaml
-        instance-mtu: 1400
-        #ext-port: "eth1"
-      to:
-        - "nodes=0"
-    glance:
-      charm: "local:trusty/glance"
-      options:
-        openstack-origin-git: include-file://glance-master.yaml
-      to:
-        - "lxc:nodes=1"
-    opnfv-promise:
-      charm: local:trusty/promise
-      to:
-        - "lxc:nodes=0"
-    neutron-openvswitch:
-      charm: "local:trusty/neutron-openvswitch"
-      options:
-        openstack-origin-git: include-file://neutron-master.yaml
-        #enable-dpdk: true
-        #data-port: ""
-        #default-socket-memory: 1024
-        #defualt-socket-cores: 1
-        #dpdk-driver: uio_pci_generic
-    congress:
-      charm: local:trusty/congress
-      options:
-        #source-branch: stable/mitaka
-      to:
-        - "lxc:nodes=1"
diff --git a/ci/nosdn/juju-deployer/scripts/cloud-setup.sh b/ci/nosdn/juju-deployer/scripts/cloud-setup.sh
deleted file mode 100755
index 8e82ef7d..00000000
--- a/ci/nosdn/juju-deployer/scripts/cloud-setup.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh -e
-
-. ~/admin-openrc
-
-# adjust tiny image
-nova flavor-delete m1.tiny
-nova flavor-create m1.tiny 1 512 8 1
-
-# configure security groups
-neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol icmp --remote-ip-prefix 0.0.0.0/0 default
-neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol tcp --port-range-min 22 --port-range-max 22 --remote-ip-prefix 0.0.0.0/0 default
-
-# import key pair
-keystone tenant-create --name demo --description "Demo Tenant"
-keystone user-create --name demo --tenant demo --pass demo --email demo@demo.demo
-
-nova keypair-add --pub-key id_rsa.pub ubuntu-keypair
-
-# configure external network
-neutron net-create ext-net --router:external --provider:physical_network external --provider:network_type flat --shared
-neutron subnet-create ext-net --name ext-subnet --allocation-pool start=10.5.8.5,end=10.5.8.254 --disable-dhcp --gateway 10.5.8.1 10.5.8.0/24
-
-# create vm network
-neutron net-create demo-net
-neutron subnet-create --name demo-subnet --gateway 10.20.5.1 demo-net 10.20.5.0/24
-
-neutron router-create demo-router
-
-neutron router-interface-add demo-router demo-subnet
-
-neutron router-gateway-set demo-router ext-net
-
-# create pool of floating ips
-i=0
-while [ $i -ne 10 ]; do
-	neutron floatingip-create ext-net
-	i=$((i + 1))
-done
-
-#http://docs.openstack.org/juno/install-guide/install/apt/content/launch-instance-neutron.html
-# nova boot --flavor m1.small --image cirros-0.3.3-x86_64 --nic net-id=b65479a4-3638-4595-9245-6e41ccd8bfd8 --security-group default --key-name ubuntu-keypair demo-instance1
-# nova floating-ip-associate demo-instance1 10.5.8.35
diff --git a/ci/nosdn/juju-deployer/scripts/glance.sh b/ci/nosdn/juju-deployer/scripts/glance.sh
deleted file mode 100755
index a18afe6c..00000000
--- a/ci/nosdn/juju-deployer/scripts/glance.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-. ~/admin-openrc
-
-wget -P /tmp/images http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-wget -P /tmp/images http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
-glance image-create --name "cirros-0.3.3-x86_64" --file /tmp/images/cirros-0.3.3-x86_64-disk.img --disk-format qcow2 --container-format bare --progress
-glance image-create --name "ubuntu-trusty-daily" --file /tmp/images/trusty-server-cloudimg-amd64-disk1.img --disk-format qcow2 --container-format bare --progress
-rm -rf /tmp/images
diff --git a/ci/nosdn/juju-deployer/scripts/openstack.sh b/ci/nosdn/juju-deployer/scripts/openstack.sh
deleted file mode 100755
index 562df8e9..00000000
--- a/ci/nosdn/juju-deployer/scripts/openstack.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh -ex
-
-configOpenrc()
-{
-	cat <<-EOF
-		export OS_USERNAME=$1
-		export OS_PASSWORD=$2
-		export OS_TENANT_NAME=$3
-		export OS_AUTH_URL=$4
-		export OS_REGION_NAME=$5
-		EOF
-}
-
-unitAddress()
-{
-	juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null
-}
-
-unitMachine()
-{
-	juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
-}
-
-#juju run --service ceph 'sudo ceph osd pool set cinder-ceph size 1'
-#juju run --service ceph 'sudo ceph osd pool set cinder-ceph min_size 1'
-
-mkdir -m 0700 -p cloud
-controller_address=$(unitAddress keystone 0)
-configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical > cloud/admin-openrc
-chmod 0600 cloud/admin-openrc
-
-machine=$(unitMachine glance 0)
-juju scp glance.sh cloud/admin-openrc $machine:
-juju run --machine $machine ./glance.sh
-
-machine=$(unitMachine nova-cloud-controller 0)
-juju scp cloud-setup.sh cloud/admin-openrc ~/.ssh/id_rsa.pub $machine:
-juju run --machine $machine ./cloud-setup.sh
-
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 6b25797a..10bcddf0 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -16,30 +16,30 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build congress
-git clone -b stable/16.07 https://github.com/openstack/charm-aodh.git $distro/charm-aodh
+git clone  https://github.com/openstack/charm-aodh.git $distro/charm-aodh
 build aodh
 
-git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster
-git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone -b stable/16.07 https://github.com/openstack/charm-ceph.git $distro/ceph
-#git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
-git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone -b stable/16.07 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
-git clone -b stable/16.07 https://github.com/openstack/charm-cinder.git $distro/cinder
-git clone -b stable/16.07 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-git clone -b stable/16.07 https://github.com/openstack/charm-glance.git $distro/glance
-git clone -b stable/16.07 https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone -b stable/16.07 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
-git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
-git clone -b stable/16.07 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
-git clone -b stable/16.07 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
-git clone -b stable/16.07 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
-git clone -b stable/16.07 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
-git clone -b stable/16.07 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-git clone -b stable/16.07 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-git clone -b stable/16.07 https://github.com/openstack/charm-heat.git $distro/heat
-git clone -b stable/16.07 https://github.com/openstack/charm-lxd.git xenial/lxd
+git clone  https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone  https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone  https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone  https://github.com/openstack/charm-ceph.git $distro/ceph
+#git clone  https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
+git clone  https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone  https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone  https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone  https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone  https://github.com/openstack/charm-glance.git $distro/glance
+git clone  https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone  https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone  https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone  https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
+git clone  https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone  https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone  https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone  https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone  https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone  https://github.com/openstack/charm-heat.git $distro/heat
+git clone  https://github.com/openstack/charm-lxd.git xenial/lxd
 
 #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
 #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer
@@ -63,6 +63,6 @@ git clone -b stable/16.07 https://github.com/openstack/charm-lxd.git xenial/lxd
 #charm pull cs:~openstack-charmers-next/lxd xenial/lxd
 
 #controller specific charm
-git clone -b stable/16.07 https://github.com/openstack/charm-odl-controller.git $distro/odl-controller
-git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl
-git clone -b stable/16.07 https://github.com/openstack/charm-openvswitch-odl.git $distro/openvswitch-odl
+git clone  https://github.com/openstack/charm-odl-controller.git $distro/odl-controller
+git clone  https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl
+git clone  https://github.com/openstack/charm-openvswitch-odl.git $distro/openvswitch-odl
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index 6ef2d341..5e3c20d7 100755
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -16,29 +16,29 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build congress
-git clone -b stable/16.07 https://github.com/openstack/charm-aodh.git $distro/charm-aodh
+git clone  https://github.com/openstack/charm-aodh.git $distro/charm-aodh
 build aodh
 
-git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster
-git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone -b stable/16.07 https://github.com/openstack/charm-ceph.git $distro/ceph
-#git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
-git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone -b stable/16.07 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
-git clone -b stable/16.07 https://github.com/openstack/charm-cinder.git $distro/cinder
-git clone -b stable/16.07 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-git clone -b stable/16.07 https://github.com/openstack/charm-glance.git $distro/glance
-git clone -b stable/16.07 https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone -b stable/16.07 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
-git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
-git clone -b stable/16.07 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
-git clone -b stable/16.07 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
-git clone -b stable/16.07 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
-git clone -b stable/16.07 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-git clone -b stable/16.07 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-git clone -b stable/16.07 https://github.com/openstack/charm-heat.git $distro/heat
-git clone -b stable/16.07 https://github.com/openstack/charm-lxd.git $distro/lxd
+git clone  https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone  https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone  https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone  https://github.com/openstack/charm-ceph.git $distro/ceph
+#git clone  https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
+git clone  https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone  https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone  https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone  https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone  https://github.com/openstack/charm-glance.git $distro/glance
+git clone  https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone  https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone  https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone  https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone  https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone  https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone  https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone  https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone  https://github.com/openstack/charm-heat.git $distro/heat
+git clone  https://github.com/openstack/charm-lxd.git $distro/lxd
 
 #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
 #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer