cleanup and also fetch the charms first then deploy.

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

15 files changed, 214 insertions, 759 deletions

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 105477ad..1c3a5104 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -2,6 +2,11 @@
 #placeholder for deployment script.
 set -ex
 
+#copy and download charms
+    cp $4/fetch-charms.sh ./fetch-charms.sh
+    sh ./fetch-charms.sh
+
+
 case "$1" in
     'nonha' )
         cp $4/juju-deployer/ovs-$4-nonha.yaml ./bundles.yaml
diff --git a/ci/bundles.yaml b/ci/bundles.yaml
deleted file mode 100644
index 6199299d..00000000
--- a/ci/bundles.yaml
+++ /dev/null
@@ -1,327 +0,0 @@
-# vim: set ts=2 et:
-openstack-phase1:
-  series: trusty
-  services:
-    nodes-api:
-      charm: "cs:trusty/ubuntu"
-      num_units: 1
-      constraints: tags=control
-    nodes-compute:
-      charm: "cs:trusty/ubuntu"
-      num_units: 1
-      constraints: tags=compute
-    ntp: 
-      charm: "cs:trusty/ntp"
-  relations:
-    - - "ntp:juju-info"
-      - "nodes-api:juju-info"
-    - - "ntp:juju-info"
-      - "nodes-compute:juju-info"
-openstack-phase2: 
-  inherits: openstack-phase1
-  services: 
-    mysql: 
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
-      num_units: 1
-      options: 
-        dataset-size: 2G
-        max-connections: 10000
-      to:
-        - "lxc:nodes-api=0"
-    ceilometer:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    ceilometer-agent:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
-    mongodb:
-      charm: "cs:trusty/mongodb"
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    heat:
-      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
-      to:
-        - "lxc:nodes-api=0"
-    ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
-      num_units: 1
-      options:
-        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: ""
-        monitor-count: 1        
-#        osd-reformat: 'no'
-#        ceph-cluster-network: 192.168.0.0/24
-#        ceph-public-network: 192.168.0.0/24
-      to:
-        - "lxc:nodes-api=0"
-    ceph-osd:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
-      num_units: 1
-      options:
-        osd-devices: /srv
-        osd-reformat: 'yes'
-      to:
-        - "nodes-compute=0"
-    ceph-radosgw:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
-      num_units: 1
-      options:
-        use-embedded-webserver: true
-      to:
-        - "lxc:nodes-api=0"
-    cinder:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
-      num_units: 1
-      options:
-        block-device: None
-        glance-api-version: 2
-#        ha-mcastport: 5401
-      to:
-        - "lxc:nodes-api=0"
-    cinder-ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
-    rabbitmq-server: 
-      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    keystone: 
-      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
-      num_units: 1
-      options: 
-#        ha-mcastport: 5402
-        admin-password: openstack
-        admin-token: admin
-      to:
-        - "lxc:nodes-api=0"
-    openstack-dashboard: 
-      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
-      num_units: 1
-      options: 
-        secret: admin
-        webroot: /
-      to:
-        - "lxc:nodes-api=0"
-    nova-compute: 
-      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
-      num_units: 1
-      options: 
-        enable-live-migration: False
-        manage-neutron-plugin-legacy-mode: False
-      to:
-        - "nodes-compute=0"
-#        - "nodes-compute=1"
-#        - "nodes-api=0"
-#        - "nodes-api=1"
-#        - "nodes-api=2"
-    nova-cloud-controller: 
-      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
-      num_units: 1
-      options: 
-        console-access-protocol: novnc
-        network-manager: Neutron
-      to:
-        - "lxc:nodes-api=0"
-    neutron-api: 
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
-      num_units: 1
-      options:
-        neutron-security-groups: True
-        manage-neutron-plugin-legacy-mode: False
-      to: 
-        - "lxc:nodes-api=0"
-    neutron-gateway:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
-      options:
-        #ext-port: "eth1"
-        plugin: ovs-odl
-        instance-mtu: 1400
-      to:  
-        - "nodes-api=0"
-    odl-controller:
-      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
-      options:
-        #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
-        install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz"
-        profile: "openvswitch-odl-lithium"
-        http-proxy: "http://squid.internal:3128"
-        https-proxy: "http://squid.internal:3128"
-      to:
-        - "lxc:nodes-api=0"
-    glance: 
-      branch: lp:~openstack-charmers/charms/trusty/glance/next
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    neutron-api-odl:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
-      options:
-        overlay-network-type: 'vxlan gre'
-        security-groups: True
-    openvswitch-odl:
-      branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
-  relations:
-    - - "neutron-api:neutron-plugin-api-subordinate"
-      - "neutron-api-odl:neutron-plugin-api-subordinate"
-    - - "nova-compute:neutron-plugin"
-      - "openvswitch-odl:neutron-plugin"
-    - - "neutron-gateway"
-      - "openvswitch-odl"
-    - - "openvswitch-odl:ovsdb-manager"
-      - "odl-controller:ovsdb-manager"
-    - - "neutron-api-odl:odl-controller"
-      - "odl-controller:controller-api"
-    - - "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"
-trusty-liberty-nodes:
-  inherits: openstack-phase1
-  overrides:
-    series: trusty
-
-trusty-liberty:
-  inherits: openstack-phase2
-  overrides:
-    #os-data-network: 10.4.8.0/21
-    #ceph-cluster-network: 10.4.0.0/21
-    #prefer-ipv6: true
-    #enable-dvr: true
-    #l2-population: true
-    #ext-port: "eth1"
-    region: Canonical
-    source: "cloud:trusty-liberty"
-    openstack-origin: "cloud:trusty-liberty"
-    series: trusty
-    ceph-osd-replication-count: 1
-    admin-role: admin
-    keystone-admin-role: admin
-
-trusty-kilo-nodes:
-  inherits: openstack-phase1
-  overrides:
-    series: trusty
-
-trusty-kilo:
-  inherits: openstack-phase2
-  overrides:
-    #os-data-network: 10.4.8.0/21
-    #ceph-cluster-network: 10.4.0.0/21
-    #prefer-ipv6: true
-    #enable-dvr: true
-    #l2-population: true
-    #ext-port: "eth1"
-    region: Canonical
-    source: "cloud:trusty-kilo"
-    openstack-origin: "cloud:trusty-kilo"
-    series: trusty
-    ceph-osd-replication-count: 1
-    admin-role: admin
-    keystone-admin-role: admin
-
-trusty-juno-nodes:
-  inherits: openstack-phase1
-  overrides:
-    series: trusty
-
-trusty-juno:
-  inherits: openstack-phase2
-  overrides:
-    #os-data-network: 10.4.8.0/21
-    #ceph-cluster-network: 10.4.0.0/21
-    #prefer-ipv6: true
-    #enable-dvr: true
-    #l2-population: true
-    #ext-port: "eth1"
-    region: Canonical
-    source: "cloud:trusty-juno"
-    openstack-origin: "cloud:trusty-juno"
-    series: trusty
-    ceph-osd-replication-count: 1
-    admin-role: admin
-    keystone-admin-role: admin
-
diff --git a/ci/deployment.yaml b/ci/deployment.yaml
deleted file mode 100644
index 8ebfd5aa..00000000
--- a/ci/deployment.yaml
+++ /dev/null
@@ -1,137 +0,0 @@
-# This file defines the deployment for the MAAS environment which is to be
-# deployed and automated.
-demo-maas:
-    # Contains the virtual machine parameters for creating the Juju bootstrap
-    # node virtual machine
-    juju-bootstrap:
-        name: bootstrap
-        interfaces: ['bridge=virbr0,model=virtio']
-        memory: 2048
-        vcpus: 2
-        arch: amd64
-        pool: default
-        disk_size: 20G
-#        sticky_ip_address:
-#            requested_address: 192.168.122.25
-
-    maas:
-        # Defines the general setup for the MAAS environment, including the
-        # username and password for the host as well as the MAAS server.
-        user: ubuntu
-        password: ubuntu
-
-        # Contains the virtual machine parameters for creating the MAAS virtual
-        # server. Here you can configure the name of the virsh domain, the
-        # parameters for how the network is attached.
-        name: opnfv-maas
-        interfaces: ['bridge=virbr0,model=virtio']
-        memory: 4096
-        vcpus: 2
-        arch: amd64
-        pool: default
-        disk_size: 60G
-
-        # Apt http proxy setting(s)
-        #apt_http_proxy:
-
-        # Package sources. These will be used on the MAAS controller.
-        apt_sources:
-          - ppa:maas/next
-          - ppa:juju/stable
-
-        # Virsh power settings
-        # Specifies the uri and keys to use for virsh power control of the 
-        # juju virtual machine. If the uri is omitted, the value for the
-        # --remote is used. If no power settings are desired, then do not
-        # supply the virsh block.
-        virsh:
-            rsa_priv_key: /home/ubuntu/.ssh/id_rsa
-            rsa_pub_key: /home/ubuntu/.ssh/id_rsa.pub
-            uri: qemu+ssh://ubuntu@192.168.122.1/system
-
-        # Defines the IP Address that the configuration script will use to
-        # to access the MAAS controller via SSH.
-        ip_address: 192.168.122.2
-
-        # This section allows the user to set a series of options on the
-        # MAAS server itself. The list of config options can be found in
-        # the upstream MAAS documentation:
-        #  - http://maas.ubuntu.com/docs/api.html#maas-server
-        settings:
-            main_archive: http://us.archive.ubuntu.com/ubuntu
-            upstream_dns: 192.168.122.1
-            maas_name: automaas
-            # kernel_opts: "console=tty0 console=ttyS1,115200n8"
-            ntp_server: ntp.ubuntu.com
-
-        # This section is used to define the networking parameters for when
-        # the node first comes up. It is fed into the meta-data cloud-init
-        # configuration and is used to configure the networking piece of the
-        # service. The contents of this section are written directly to the
-        # /etc/network/interfaces file.
-        #
-        # Please note, this is slightly different than the
-        # node-group-interfaces section below. This will configure the
-        # machine's networking params, and the node-group-interfaces will
-        # configure the maas node-group interfaces which is used for
-        # controlling the dhcp, dns, etc.
-        network_config: |
-            auto lo
-            iface lo inet loopback
-
-            auto eth0
-            iface eth0 inet static
-              address 192.168.122.2
-              netmask 255.255.255.0
-              network 192.168.122.0
-              broadcast 192.168.122.255
-              gateway 192.168.122.1
-              dns-nameservers 192.168.122.1 127.0.0.1
-
-        # See https://maas.ubuntu.com/docs/maascli.html#node-groups for
-        # description and full list of supported options.
-        # NOTE: interfaces are added using the node_group_interfaces section
-        #       and only one node_group can be created by this bundle.
-        #       Additional node groups can be added post deployment.
-        #node_group:
-        #    # This is the cluster DNS name.
-        #    name: maas
-
-        # The node-group-interfaces section is used to configure the MAAS
-        # network interfaces. Basic configuration is supported, such as which
-        # device should be bound, the range of IP addresses, etc.
-        # Note: this may contain the special identifiers:
-        #   ${maas_net} - the first 3 octets of the ipv4 address
-        #   ${maas_ip} - the ip address of the MAAS controller 
-        node_group_ifaces:
-            - device: eth0
-              ip: 192.168.122.2
-              subnet_mask: 255.255.255.0
-              broadcast_ip: 192.168.122.255
-              router_ip: 192.168.122.1
-              static_range:
-                  low: 192.168.122.101
-                  high: 192.168.122.200
-              dynamic_range:
-                  low: 192.168.122.25
-                  high: 192.168.122.100
-
-        # Physical nodes to be added to the MAAS cluster. Nodes will be
-        # configured, commissioned and put into the Ready state so
-        # they are ready to be deployed to.
-        #nodes:
-        #    - name: node1
-        #      tags: api
-        #      architecture: amd64/generic
-        #      mac_addresses:
-        #          - "38:63:bb:43:b8:9c"
-        #      power:
-        #          type: ipmi
-        #          address: 10.0.1.1
-        #          user: maas
-        #          pass: passw0rd
-        #          driver: LAN_2_0
-        #      sticky_ip_address:
-        #          mac_address: "38:63:bb:43:b8:9c"
-        #          requested_address: 192.168.122.6
-
diff --git a/ci/fetch-charms.sh b/ci/fetch-charms.sh
new file mode 100755
index 00000000..2912e5c9
--- /dev/null
+++ b/ci/fetch-charms.sh
@@ -0,0 +1,39 @@
+#!/bin/sh -ex
+
+distro=$distro
+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:~opnfv-team/charms/$distro/haproxy/trunk $distro/haproxy
+
+# Controller specific charm
+bzr branch lp:~sdn-charmers/charms/$distro/keepalived/trunk $distro/keepalived
+bzr branch lp:~stub/charms/$distro/cassandra/noauthentication $distro/cassandra-noauthentication
+bzr branch lp:~sdn-charmers/charms/$distro/contrail-analytics/trunk $distro/contrail-analytics
+bzr branch lp:~sdn-charmers/charms/$distro/contrail-configuration/trunk $distro/contrail-configuration
+bzr branch lp:~sdn-charmers/charms/$distro/contrail-control/trunk $distro/contrail-control
+bzr branch lp:~sdn-charmers/charms/$distro/contrail-webui/trunk $distro/contrail-webui
+bzr branch lp:~charmers/charms/precise/zookeeper/trunk src/charms/precise/zookeeper
+bzr branch lp:~opnfv-team/charms/$distro/neutron-api-contrail/trunk $distro/neutron-api-contrail
+bzr branch lp:~opnfv-team/charms/$distro/neutron-contrail/trunk $distro/neutron-contrail
+
diff --git a/ci/maas/intel/pod5/interfaces.host b/ci/maas/intel/pod5/interfaces.host
deleted file mode 100644
index 9377814c..00000000
--- a/ci/maas/intel/pod5/interfaces.host
+++ /dev/null
@@ -1,36 +0,0 @@
-#### original juju generated part ####
-auto lo
-
-# Primary interface (defining the default route)
-iface eth0 inet manual
-
-# Bridge to use for LXC/KVM containers
-auto juju-br0
-iface juju-br0 inet dhcp
-    bridge_ports eth0
-######################################
-
-auto eth2
-iface eth2 inet manual
-
-auto eth2.721
-iface eth2.721 inet manual
-
-auto brData
-iface brData inet dhcp
-  bridge_ports eth2.721
-  bridge_stp off
-  bridge_fd 0
-  bridge_maxwait 0
-
-# The public network interface
-auto eth2.724
-iface eth2.724 inet manual
-
-auto brPublic
-iface brPublic inet dhcp
-        bridge_ports eth2.724
-        bridge_stp off
-        bridge_fd 0
-        bridge_maxwait 0
-
diff --git a/ci/maas/intel/pod5/lxc-add-more-interfaces b/ci/maas/intel/pod5/lxc-add-more-interfaces
deleted file mode 100755
index c9bca9fd..00000000
--- a/ci/maas/intel/pod5/lxc-add-more-interfaces
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-set -e
-set -u
-
-cat <<EOF >> "$LXC_CONFIG_FILE"
-
-## added by juju charm
-lxc.network.type = veth
-lxc.network.flags = up
-lxc.network.link = brData
-lxc.network.name = eth1
-lxc.network.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')
-
-lxc.network.type = veth
-lxc.network.flags = up
-lxc.network.link = brPublic
-lxc.network.name = eth2
-lxc.network.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')
-EOF
-
-USERDATA="$LXC_ROOTFS_PATH/var/lib/cloud/seed/nocloud-net/user-data"
-
-additional_interfaces="
-- |
-  cat <<EOF >> /etc/network/interfaces.d/additional-interfaces
-  ## added by juju charm
-  ## those interfaces will be brought up by the upstart job as /etc/init/additional-interfaces.conf
-  ## LP: #1483932
-  auto eth1
-  iface eth1 inet dhcp
-
-  auto eth2
-  iface eth2 inet dhcp
-  EOF
-- machine_agent=\$(hostname | sed -e 's/^juju-/jujud-/')
-- |
-  cat <<EOF > /etc/init/additional-interfaces.conf
-  ## added by juju charm
-  ## LP: #1483932
-  start on started \${machine_agent}
-
-  script
-    sleep 10
-    ifup -a -i /etc/network/interfaces.d/additional-interfaces
-  end script
-  EOF
-"
-additional_interfaces=$(echo "$additional_interfaces" | sed -e 's/$/\\n/' | tr -d '\n')
-
-sed -i.orig -e "s@^runcmd:@\0$additional_interfaces@" \
-    "$USERDATA"
diff --git a/ci/maas/intel/pod6/interfaces.host b/ci/maas/intel/pod6/interfaces.host
deleted file mode 100644
index 86cdd056..00000000
--- a/ci/maas/intel/pod6/interfaces.host
+++ /dev/null
@@ -1,33 +0,0 @@
-#### original juju generated part ####
-auto lo
-
-# Primary interface (defining the default route)
-iface eth0 inet manual
-
-# Bridge to use for LXC/KVM containers
-auto juju-br0
-iface juju-br0 inet dhcp
-    bridge_ports eth0
-######################################
-
-auto eth1
-iface eth1 inet manual
-
-auto brData
-iface brData inet dhcp
-  bridge_ports eth1
-  bridge_stp off
-  bridge_fd 0
-  bridge_maxwait 0
-
-# The public network interface
-auto eth2
-iface eth2 inet manual
-
-auto brPublic
-iface brPublic inet dhcp
-        bridge_ports eth2
-        bridge_stp off
-        bridge_fd 0
-        bridge_maxwait 0
-
diff --git a/ci/maas/intel/pod6/lxc-add-more-interfaces b/ci/maas/intel/pod6/lxc-add-more-interfaces
deleted file mode 100755
index c9bca9fd..00000000
--- a/ci/maas/intel/pod6/lxc-add-more-interfaces
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-set -e
-set -u
-
-cat <<EOF >> "$LXC_CONFIG_FILE"
-
-## added by juju charm
-lxc.network.type = veth
-lxc.network.flags = up
-lxc.network.link = brData
-lxc.network.name = eth1
-lxc.network.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')
-
-lxc.network.type = veth
-lxc.network.flags = up
-lxc.network.link = brPublic
-lxc.network.name = eth2
-lxc.network.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')
-EOF
-
-USERDATA="$LXC_ROOTFS_PATH/var/lib/cloud/seed/nocloud-net/user-data"
-
-additional_interfaces="
-- |
-  cat <<EOF >> /etc/network/interfaces.d/additional-interfaces
-  ## added by juju charm
-  ## those interfaces will be brought up by the upstart job as /etc/init/additional-interfaces.conf
-  ## LP: #1483932
-  auto eth1
-  iface eth1 inet dhcp
-
-  auto eth2
-  iface eth2 inet dhcp
-  EOF
-- machine_agent=\$(hostname | sed -e 's/^juju-/jujud-/')
-- |
-  cat <<EOF > /etc/init/additional-interfaces.conf
-  ## added by juju charm
-  ## LP: #1483932
-  start on started \${machine_agent}
-
-  script
-    sleep 10
-    ifup -a -i /etc/network/interfaces.d/additional-interfaces
-  end script
-  EOF
-"
-additional_interfaces=$(echo "$additional_interfaces" | sed -e 's/$/\\n/' | tr -d '\n')
-
-sed -i.orig -e "s@^runcmd:@\0$additional_interfaces@" \
-    "$USERDATA"
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 3cf269c2..1c1074ed 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -1,19 +1,26 @@
 #!/bin/sh -ex
 
-mkdir -p src/charms/trusty
+distro=trusty
+mkdir -p $distro
 
 # openstack
-bzr branch lp:~openstack-charmers/charms/trusty/glance/next src/charms/trusty/glance-next
-bzr branch lp:~openstack-charmers/charms/trusty/keystone/next src/charms/trusty/keystone-next
-bzr branch lp:~sdn-charmers/charms/trusty/neutron-api/odl src/charms/trusty/neutron-api-odl
-bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next src/charms/trusty/nova-cloud-controller-next
-bzr branch lp:~sdn-charmers/charms/trusty/nova-compute/odl src/charms/trusty/nova-compute-odl
-bzr branch lp:~openstack-charmers/charms/trusty/openstack-dashboard/next src/charms/trusty/openstack-dashboard-next
-bzr branch lp:~sdn-charmers/charms/trusty/quantum-gateway/odl src/charms/trusty/quantum-gateway-odl
-
-# opendaylight
-bzr branch lp:~sdn-charmers/charms/trusty/odl-controller/trunk src/charms/trusty/odl-controller
-bzr branch lp:~sdn-charmers/charms/trusty/neutron-odl/trunk src/charms/trusty/neutron-odl
-
-mkdir -p charms/trusty
-(cd charms/trusty; ln -s ../../src/charms/trusty/* .)
+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
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 8df30b26..1ce07c93 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -21,16 +21,16 @@ openstack-phase2:
   inherits: openstack-phase1
   services:
     ceilometer:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+      charm: "local:trusty/ceilometer"
       num_units: 3
       to:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     ceilometer-agent:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
+      charm: "local:trusty/ceilometer-agent"
     ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
+      charm: "local:trusty/ceph"
       num_units: 3
       options:
         monitor-count: 3
@@ -45,7 +45,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     ceph-osd:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
+      charm: "local:trusty/ceph-osd"
       num_units: 2
       options:
         osd-devices: /srv
@@ -54,7 +54,7 @@ openstack-phase2:
         - "nodes-compute=0"
         - "nodes-compute=1"
     ceph-radosgw:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
+      charm: "local:trusty/ceph-radosgw"
       num_units: 1
       options:
         use-embedded-webserver: true
@@ -62,7 +62,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
+      charm: "local:trusty/cinder"
       num_units: 3
       options:
         block-device: None
@@ -73,10 +73,10 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     cinder-ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
+      charm: "local:trusty/cinder-ceph"
       num_units: 0
     glance:
-      branch: "lp:~openstack-charmers/charms/trusty/glance/next"
+      charm: "local:trusty/glance"
       num_units: 3
       options:
         ha-mcastport: 5402
@@ -86,12 +86,12 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
+      charm: local:trusty/promise
       num_units: 1
       to:
         - "lxc:nodes-api=2"
     keystone:
-      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
+      charm: "local:trusty/keystone"
       num_units: 3
       options:
         admin-password: openstack
@@ -108,7 +108,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     mysql:
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
+      charm: "local:trusty/percona-cluster"
       num_units: 3
       options:
         max-connections: 20000
@@ -121,7 +121,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     neutron-api:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-api/next"
+      charm: "local:trusty/neutron-api"
       num_units: 3
       options:
         neutron-security-groups: true
@@ -131,7 +131,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     neutron-gateway:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
+      charm: "local:trusty/neutron-gateway"
       num_units: 1
       options:
         #ext-port: "eth1"
@@ -139,10 +139,10 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     neutron-openvswitch:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
+      charm: "local:trusty/neutron-openvswitch"
       num_units: 0
     nova-cloud-controller:
-      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
+      charm: "local:trusty/nova-cloud-controller"
       num_units: 3
       options:
         network-manager: Neutron
@@ -153,7 +153,7 @@ openstack-phase2:
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     nova-compute:
-      branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next"
+      charm: "local:trusty/nova-compute"
       num_units: 2
       options:
         enable-live-migration: true
@@ -167,7 +167,7 @@ openstack-phase2:
 #        - "nodes-api=1"
 #        - "nodes-api=2"
     openstack-dashboard:
-      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
+      charm: "local:trusty/openstack-dashboard"
       num_units: 3
       options:
         secret: admin
@@ -178,38 +178,38 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     rabbitmq-server:
-      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
+      charm: "local:trusty/rabbitmq-server"
       num_units: 3
       to:
         - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     heat:
-      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
+      charm: "local:trusty/heat"
       to:
         - "lxc:nodes-api=0"
     hacluster-keystone:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
     hacluster-horizon:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
     hacluster-nova:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
     hacluster-neutron:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
     hacluster-glance:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 41d218d4..1c2961ef 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -21,14 +21,14 @@ openstack-phase2:
   inherits: openstack-phase1
   services:
     ceilometer:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+      charm: "local:charms/trusty/ceilometer"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     ceilometer-agent:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
+      charm: "local:trusty/ceilometer-agent"
     ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
+      charm: "local:trusty/ceph"
       num_units: 2
       options:
         monitor-count: 2
@@ -42,7 +42,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=0"
     ceph-osd:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
+      charm: "local:trusty/ceph-osd"
       num_units: 2
       options:
         osd-devices: /srv
@@ -51,7 +51,7 @@ openstack-phase2:
         - "nodes-compute=0"
         - "nodes-compute=1"
     ceph-radosgw:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
+      charm: "local:trusty/ceph-radosgw"
       num_units: 1
       options:
         use-embedded-webserver: true
@@ -59,7 +59,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
+      charm: "local:trusty/cinder"
       num_units: 1
       options:
         block-device: None
@@ -68,22 +68,22 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder-ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
+      charm: "local:trusty/cinder-ceph"
       num_units: 0
     glance:
-      branch: "lp:~openstack-charmers/charms/trusty/glance/next"
+      charm: "local:trusty/glance"
       num_units: 1
       options:
         ha-mcastport: 5402
       to:
         - "lxc:nodes-api=0"
     opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
+      charm: local:trusty/promise
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     keystone:
-      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
+      charm: "local:trusty/keystone"
       num_units: 1
       options:
         admin-password: openstack
@@ -97,14 +97,14 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     mysql:
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
+      charm: "local:trusty/percona-cluster"
       num_units: 1
       options:
         max-connections: 20000
       to:
         - "lxc:nodes-api=0"
     neutron-api:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-api/next"
+      charm: "local:trusty/neutron-api"
       num_units: 1
       options:
         neutron-security-groups: true
@@ -112,7 +112,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-gateway:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
+      charm: "local:trusty/neutron-gateway"
       num_units: 1
       options:
         instance-mtu: 1400
@@ -120,17 +120,17 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     neutron-openvswitch:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
+      charm: "local:trusty/neutron-openvswitch"
       num_units: 0
     nova-cloud-controller:
-      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
+      charm: "local:trusty/nova-cloud-controller"
       num_units: 1
       options:
         network-manager: Neutron
       to:
         - "lxc:nodes-api=0"
     nova-compute:
-      branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next"
+      charm: "local:trusty/nova-compute"
       num_units: 2
       options:
         enable-live-migration: true
@@ -144,7 +144,7 @@ openstack-phase2:
 #        - "nodes-api=1"
 #        - "nodes-api=2"
     openstack-dashboard:
-      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
+      charm: "local:trusty/openstack-dashboard"
       num_units: 1
       options:
         secret: admin
@@ -152,12 +152,12 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     rabbitmq-server:
-      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
+      charm: "local:trusty/rabbitmq-server"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     heat:
-      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
+      charm: "local:trusty/heat"
       to:
         - "lxc:nodes-api=0"
   relations:
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index a5b6cef8..44cb57a9 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -21,7 +21,7 @@ openstack-phase2:
   inherits: openstack-phase1
   services:
     mysql:
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
+      charm: "local:trusty/percona-cluster"
       num_units: 1
       options:
         dataset-size: 2G
@@ -29,23 +29,23 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     ceilometer:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+      charm: "local:trusty/ceilometer"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     ceilometer-agent:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
+      charm: "local:trusty/ceilometer-agent"
     mongodb:
       charm: "cs:trusty/mongodb"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     heat:
-      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
+      charm: "local:trusty/heat"
       to:
         - "lxc:nodes-api=0"
     ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
+      charm: "local:trusty/ceph"
       num_units: 2
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
@@ -59,7 +59,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=0"
     ceph-osd:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
+      charm: "local:trusty/ceph-osd"
       num_units: 2
       options:
         osd-devices: /srv
@@ -68,7 +68,7 @@ openstack-phase2:
         - "nodes-compute=0"
         - "nodes-compute=1"
     ceph-radosgw:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
+      charm: "local:trusty/ceph-radosgw"
       num_units: 1
       options:
         use-embedded-webserver: true
@@ -76,7 +76,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
+      charm: "local:trusty/cinder"
       num_units: 1
       options:
         block-device: None
@@ -86,14 +86,14 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder-ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
+      charm: "local:trusty/cinder-ceph"
     rabbitmq-server:
-      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
+      charm: "local:trusty/rabbitmq-server"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     keystone:
-      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
+      charm: "local:trusty/keystone"
       num_units: 1
       options:
         openstack-origin-git: include-file://keystone-master.yaml
@@ -102,7 +102,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     openstack-dashboard:
-      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
+      charm: "local:trusty/openstack-dashboard"
       num_units: 1
       options:
         openstack-origin-git: include-file://horizon-master.yaml
@@ -110,7 +110,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     nova-compute:
-      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+      charm: local:trusty/nova-compute
       num_units: 2
       options:
         openstack-origin-git: include-file://nova-master.yaml
@@ -122,7 +122,7 @@ openstack-phase2:
         - "nodes-compute=0"
         - "nodes-compute=1"
     nova-cloud-controller:
-      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
+      charm: "local:trusty/nova-cloud-controller"
       num_units: 1
       options:
         openstack-origin-git: include-file://nova-master.yaml
@@ -131,7 +131,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-api:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      charm: local:charms/trusty/neutron-api
       num_units: 1
       options:
         neutron-security-groups: True
@@ -139,7 +139,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-gateway:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
+      charm: "local:trusty/neutron-gateway"
       options:
         openstack-origin-git: include-file://neutron-master.yaml
         instance-mtu: 1400
@@ -147,19 +147,19 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     glance:
-      branch: "lp:~openstack-charmers/charms/trusty/glance/next"
+      charm: "local:trusty/glance"
       num_units: 1
       options:
         openstack-origin-git: include-file://glance-master.yaml
       to:
         - "lxc:nodes-api=0"
     opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
+      charm: local:trusty/promise
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     neutron-openvswitch:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
+      charm: "local:trusty/neutron-openvswitch"
       options:
         openstack-origin-git: include-file://neutron-master.yaml
   relations:
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 3cf269c2..035a965d 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -1,19 +1,32 @@
 #!/bin/sh -ex
 
-mkdir -p src/charms/trusty
+distro=$distro
+mkdir -p $distro
 
 # openstack
-bzr branch lp:~openstack-charmers/charms/trusty/glance/next src/charms/trusty/glance-next
-bzr branch lp:~openstack-charmers/charms/trusty/keystone/next src/charms/trusty/keystone-next
-bzr branch lp:~sdn-charmers/charms/trusty/neutron-api/odl src/charms/trusty/neutron-api-odl
-bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next src/charms/trusty/nova-cloud-controller-next
-bzr branch lp:~sdn-charmers/charms/trusty/nova-compute/odl src/charms/trusty/nova-compute-odl
-bzr branch lp:~openstack-charmers/charms/trusty/openstack-dashboard/next src/charms/trusty/openstack-dashboard-next
-bzr branch lp:~sdn-charmers/charms/trusty/quantum-gateway/odl src/charms/trusty/quantum-gateway-odl
+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
 
-# opendaylight
-bzr branch lp:~sdn-charmers/charms/trusty/odl-controller/trunk src/charms/trusty/odl-controller
-bzr branch lp:~sdn-charmers/charms/trusty/neutron-odl/trunk src/charms/trusty/neutron-odl
+#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
 
-mkdir -p charms/trusty
-(cd charms/trusty; ln -s ../../src/charms/trusty/* .)
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index c5e2e2b8..f352b6cf 100644
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -1,17 +1,32 @@
 #!/bin/sh -ex
 
-mkdir -p src/charms/trusty
-# onos
-bzr branch lp:~wuwenbin2/onosfw/onos-controller src/charms/trusty/onos-controller
-bzr branch lp:~wuwenbin2/onosfw/neutron-gateway src/charms/trusty/neutron-gateway
-bzr branch lp:~wuwenbin2/onosfw/neutron-api-onos src/charms/trusty/neutron-api-onos
-bzr branch lp:~wuwenbin2/onosfw/openvswitch-onos src/charms/trusty/openvswitch-onos
-# openstack
-bzr branch lp:~openstack-charmers/charms/trusty/glance/next src/charms/trusty/glance-next
-bzr branch lp:~openstack-charmers/charms/trusty/keystone/next src/charms/trusty/keystone-next
-bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next src/charms/trusty/nova-cloud-controller-next
-bzr branch lp:~openstack-charmers/charms/trusty/openstack-dashboard/next src/charms/trusty/openstack-dashboard-next
+distro=trusty
+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
 
-mkdir -p charms/trusty
-(cd charms/trusty; ln -s ../../src/charms/trusty/* .)
+# Controller specific charm
+bzr branch lp:~wuwenbin2/onosfw/onos-controller $distro/onos-controller
+bzr branch lp:~wuwenbin2/onosfw/neutron-gateway $distro/neutron-gateway
+bzr branch lp:~wuwenbin2/onosfw/neutron-api-onos $distro/neutron-api-onos
+bzr branch lp:~wuwenbin2/onosfw/openvswitch-onos $distro/openvswitch-onos
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 5f6f0f9f..2912e5c9 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -1,26 +1,39 @@
 #!/bin/sh -ex
 
-mkdir -p src/charms/trusty src/charms/precise
+distro=$distro
+mkdir -p $distro
 
 # openstack
-bzr branch lp:~openstack-charmers/charms/trusty/glance/next src/charms/trusty/glance-next
-bzr branch lp:~openstack-charmers/charms/trusty/keystone/next src/charms/trusty/keystone-next
-bzr branch lp:~openstack-charmers/charms/trusty/neutron-api/next src/charms/trusty/neutron-api-next
-bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next src/charms/trusty/nova-cloud-controller-next
-bzr branch lp:~openstack-charmers/charms/trusty/nova-compute/next src/charms/trusty/nova-compute-next
-bzr branch lp:~openstack-charmers/charms/trusty/openstack-dashboard/next src/charms/trusty/openstack-dashboard-next
+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:~opnfv-team/charms/$distro/haproxy/trunk $distro/haproxy
 
-# contrail
-bzr branch lp:~stub/charms/trusty/cassandra/noauthentication src/charms/trusty/cassandra-noauthentication
-bzr branch lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk src/charms/trusty/contrail-analytics
-bzr branch lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk src/charms/trusty/contrail-configuration
-bzr branch lp:~sdn-charmers/charms/trusty/contrail-control/trunk src/charms/trusty/contrail-control
-bzr branch lp:~sdn-charmers/charms/trusty/contrail-webui/trunk src/charms/trusty/contrail-webui
-bzr branch lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk src/charms/trusty/neutron-api-contrail
-bzr branch lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk src/charms/trusty/neutron-contrail
+# Controller specific charm
+bzr branch lp:~sdn-charmers/charms/$distro/keepalived/trunk $distro/keepalived
+bzr branch lp:~stub/charms/$distro/cassandra/noauthentication $distro/cassandra-noauthentication
+bzr branch lp:~sdn-charmers/charms/$distro/contrail-analytics/trunk $distro/contrail-analytics
+bzr branch lp:~sdn-charmers/charms/$distro/contrail-configuration/trunk $distro/contrail-configuration
+bzr branch lp:~sdn-charmers/charms/$distro/contrail-control/trunk $distro/contrail-control
+bzr branch lp:~sdn-charmers/charms/$distro/contrail-webui/trunk $distro/contrail-webui
 bzr branch lp:~charmers/charms/precise/zookeeper/trunk src/charms/precise/zookeeper
+bzr branch lp:~opnfv-team/charms/$distro/neutron-api-contrail/trunk $distro/neutron-api-contrail
+bzr branch lp:~opnfv-team/charms/$distro/neutron-contrail/trunk $distro/neutron-contrail
 
-mkdir -p charms/trusty charms/precise
-(cd charms/trusty; ln -s ../../src/charms/trusty/* .)
-# symlink trusty charms to precise
-(cd charms/precise; ln -s ../../src/charms/trusty/* .; ln -s ../../src/charms/precise/* .)