Added a script to have a openstack with odl bundle.

Crate files which will get used by CI to build and
deploy the OPNFV platform using JOID. Added script to deploy
master branch of openstack with Ubuntu with ODL.

deploy.sh will copy the appropriate deploy.sh ad deployopnfv.sh and
run the scripts.

Change-Id: Ia1fd744d36bd153def4ef6aab4643cf440e90206
JIRA:JOID-1

19 files changed, 793 insertions, 0 deletions

diff --git a/ci/intel/pod5/kilo/odl/deploy.sh b/ci/intel/pod5/kilo/odl/deploy.sh
new file mode 100644
index 00000000..1c80d978
--- /dev/null
+++ b/ci/intel/pod5/kilo/odl/deploy.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+#placeholder for deployment script.
+set -ex
+
+cp intel/pod5/kilo/odl/ovs-odl.yaml ./
+
+echo "... Deployment Started ...."
+
+JUJU_REPOSITORY=
+juju set-constraints tags=
+
+juju-deployer -d -r 13 -c ovs-odl.yaml trusty-kilo
+
+echo "... Deployment finished ...."
diff --git a/ci/intel/pod5/kilo/odl/environment.yaml b/ci/intel/pod5/kilo/odl/environment.yaml
new file mode 100644
index 00000000..10f7637b
--- /dev/null
+++ b/ci/intel/pod5/kilo/odl/environment.yaml
@@ -0,0 +1,36 @@
+default: maas
+environments:
+    # https://juju.ubuntu.com/docs/config-maas.html
+    maas:
+        type: maas
+
+        # maas-server specifies the location of the MAAS server. It must
+        # specify the base path.
+        #
+        maas-server: 'http://10.4.1.1/MAAS/'
+
+        # maas-oauth holds the OAuth credentials from MAAS.
+        #
+        maas-oauth: 'c6tcQz4tyS3ALajCtF:sqcWhw8MkxTjUDLZrm:hBhszBLv5EqrY8h6yktFXWUT5825ShvE'
+
+        # maas-server bootstrap ssh connection options
+        #
+
+        # bootstrap-timeout time to wait contacting a state server, in seconds.
+        bootstrap-timeout: 1800
+        admin-secret: admin
+
+        # Whether or not to refresh the list of available updates for an
+        # OS. The default option of true is recommended for use in
+        # production systems, but disabling this can speed up local
+        # deployments for development or testing.
+        #
+        enable-os-refresh-update: false
+
+        # Whether or not to perform OS upgrades when machines are
+        # provisioned. The default option of true is recommended for use
+        # in production systems, but disabling this can speed up local
+        # deployments for development or testing.
+        #
+        enable-os-upgrade: false
+
diff --git a/ci/intel/pod5/kilo/odl/ha/deploy.sh b/ci/intel/pod5/kilo/odl/ha/deploy.sh
new file mode 100644
index 00000000..5e8044be
--- /dev/null
+++ b/ci/intel/pod5/kilo/odl/ha/deploy.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+#placeholder for deployment script.
+set -ex
+
+cp intel/pod5/kilo/odl/ha/ovs-odl.yaml ./
+
+echo "Deployment Started ...."
+
+JUJU_REPOSITORY=
+juju set-constraints tags=
+juju-deployer -d -r 13 -c ovs-odl.yaml trusty-kilo
+
+echo "... Deployment finished"
diff --git a/ci/intel/pod5/kilo/odl/ha/environment.yaml b/ci/intel/pod5/kilo/odl/ha/environment.yaml
new file mode 100644
index 00000000..10f7637b
--- /dev/null
+++ b/ci/intel/pod5/kilo/odl/ha/environment.yaml
@@ -0,0 +1,36 @@
+default: maas
+environments:
+    # https://juju.ubuntu.com/docs/config-maas.html
+    maas:
+        type: maas
+
+        # maas-server specifies the location of the MAAS server. It must
+        # specify the base path.
+        #
+        maas-server: 'http://10.4.1.1/MAAS/'
+
+        # maas-oauth holds the OAuth credentials from MAAS.
+        #
+        maas-oauth: 'c6tcQz4tyS3ALajCtF:sqcWhw8MkxTjUDLZrm:hBhszBLv5EqrY8h6yktFXWUT5825ShvE'
+
+        # maas-server bootstrap ssh connection options
+        #
+
+        # bootstrap-timeout time to wait contacting a state server, in seconds.
+        bootstrap-timeout: 1800
+        admin-secret: admin
+
+        # Whether or not to refresh the list of available updates for an
+        # OS. The default option of true is recommended for use in
+        # production systems, but disabling this can speed up local
+        # deployments for development or testing.
+        #
+        enable-os-refresh-update: false
+
+        # Whether or not to perform OS upgrades when machines are
+        # provisioned. The default option of true is recommended for use
+        # in production systems, but disabling this can speed up local
+        # deployments for development or testing.
+        #
+        enable-os-upgrade: false
+
diff --git a/ci/intel/pod5/kilo/odl/ha/ovs-odl.yaml b/ci/intel/pod5/kilo/odl/ha/ovs-odl.yaml
new file mode 100644
index 00000000..8da98659
--- /dev/null
+++ b/ci/intel/pod5/kilo/odl/ha/ovs-odl.yaml
@@ -0,0 +1,101 @@
+openstack-services:
+  series: trusty
+  services:
+    ubuntu:
+      branch: "lp:charms/trusty/ubuntu"
+      num_utils: 1
+      constraints: tags=physical
+    neutron-gateway:
+      branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
+      constraints: tags=neutron
+      options:
+        plugin: ovs-odl
+        instance-mtu: 1400
+    nova-compute:
+      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+      num_units: 2
+      constraints: tags=physical
+      options:
+        enable-live-migration: False
+        manage-neutron-plugin-legacy-mode: False
+    neutron-api:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      options:
+        neutron-security-groups: False
+        manage-neutron-plugin-legacy-mode: False
+      to: lxc:ubuntu=0
+    neutron-api-odl:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
+      options:
+        overlay-network-type: 'vxlan gre'
+        security-groups: true
+    odl-controller:
+      branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
+      options:
+        install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
+      to: lxc:ubuntu=0
+    openvswitch-odl:
+      charm: local:trusty/openvswitch-odl
+    mysql:
+      charm: cs:trusty/mysql
+      options:
+        dataset-size: 50%
+        max-connections: 20000
+      to: lxc:ubuntu=0
+    rabbitmq-server:
+      charm: cs:trusty/rabbitmq-server
+      to: lxc:ubuntu=0
+    keystone:
+      charm: cs:trusty/keystone
+      options:
+        admin-password: openstack
+        admin-token: admin
+      to: lxc:ubuntu=0
+    openstack-dashboard:
+      charm: cs:trusty/openstack-dashboard
+      to: lxc:ubuntu=0
+    nova-cloud-controller:
+      charm: cs:trusty/nova-cloud-controller
+      options:
+        network-manager: Neutron
+        quantum-security-groups: "yes"
+      to: lxc:ubuntu=0
+    glance:
+      charm: cs:trusty/glance
+      to: lxc:ubuntu=0
+  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-compute:cloud-compute', 'nova-cloud-controller: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']
+    - ['neutron-api:shared-db', 'mysql:shared-db']
+    - ['neutron-api:amqp', 'rabbitmq-server:amqp']
+    - ['neutron-api:neutron-api', 'nova-cloud-controller: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']
+    - ['neutron-gateway:quantum-network-service', 'nova-cloud-controller:quantum-network-service']
+    - ['openstack-dashboard:identity-service','keystone:identity-service']
+trusty-kilo:
+  inherits: openstack-services
+  overrides:
+    openstack-origin: cloud:trusty-kilo
+trusty-juno:
+  inherits: openstack-services
+  overrides:
+    openstack-origin: cloud:trusty-juno
+trusty-icehouse:
+  inherits: openstack-services
+
diff --git a/ci/intel/pod5/kilo/odl/ovs-odl.yaml b/ci/intel/pod5/kilo/odl/ovs-odl.yaml
new file mode 100644
index 00000000..8da98659
--- /dev/null
+++ b/ci/intel/pod5/kilo/odl/ovs-odl.yaml
@@ -0,0 +1,101 @@
+openstack-services:
+  series: trusty
+  services:
+    ubuntu:
+      branch: "lp:charms/trusty/ubuntu"
+      num_utils: 1
+      constraints: tags=physical
+    neutron-gateway:
+      branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
+      constraints: tags=neutron
+      options:
+        plugin: ovs-odl
+        instance-mtu: 1400
+    nova-compute:
+      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+      num_units: 2
+      constraints: tags=physical
+      options:
+        enable-live-migration: False
+        manage-neutron-plugin-legacy-mode: False
+    neutron-api:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      options:
+        neutron-security-groups: False
+        manage-neutron-plugin-legacy-mode: False
+      to: lxc:ubuntu=0
+    neutron-api-odl:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
+      options:
+        overlay-network-type: 'vxlan gre'
+        security-groups: true
+    odl-controller:
+      branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
+      options:
+        install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
+      to: lxc:ubuntu=0
+    openvswitch-odl:
+      charm: local:trusty/openvswitch-odl
+    mysql:
+      charm: cs:trusty/mysql
+      options:
+        dataset-size: 50%
+        max-connections: 20000
+      to: lxc:ubuntu=0
+    rabbitmq-server:
+      charm: cs:trusty/rabbitmq-server
+      to: lxc:ubuntu=0
+    keystone:
+      charm: cs:trusty/keystone
+      options:
+        admin-password: openstack
+        admin-token: admin
+      to: lxc:ubuntu=0
+    openstack-dashboard:
+      charm: cs:trusty/openstack-dashboard
+      to: lxc:ubuntu=0
+    nova-cloud-controller:
+      charm: cs:trusty/nova-cloud-controller
+      options:
+        network-manager: Neutron
+        quantum-security-groups: "yes"
+      to: lxc:ubuntu=0
+    glance:
+      charm: cs:trusty/glance
+      to: lxc:ubuntu=0
+  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-compute:cloud-compute', 'nova-cloud-controller: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']
+    - ['neutron-api:shared-db', 'mysql:shared-db']
+    - ['neutron-api:amqp', 'rabbitmq-server:amqp']
+    - ['neutron-api:neutron-api', 'nova-cloud-controller: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']
+    - ['neutron-gateway:quantum-network-service', 'nova-cloud-controller:quantum-network-service']
+    - ['openstack-dashboard:identity-service','keystone:identity-service']
+trusty-kilo:
+  inherits: openstack-services
+  overrides:
+    openstack-origin: cloud:trusty-kilo
+trusty-juno:
+  inherits: openstack-services
+  overrides:
+    openstack-origin: cloud:trusty-juno
+trusty-icehouse:
+  inherits: openstack-services
+
diff --git a/ci/intel/pod5/maas/config.sh b/ci/intel/pod5/maas/config.sh
new file mode 100644
index 00000000..b5190b0f
--- /dev/null
+++ b/ci/intel/pod5/maas/config.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+# TODO
+# run the script to configure MAASS with set of data
+MAASUSER=admin
+MAASPASS=admin
+MAASINTF="br0"
+MAASGATEWAY=10.4.0.1
+MAASDHCPIPSTART=10.4.1.50
+MAASDHCPIPEND=10.4.1.254
+MAASSTATICSTART=10.4.2.20
+MAASSTATICEND=10.4.2.254
+MAASUPSTREAMDNS=10.4.0.2
+MAASPROXY="http://10.4.1.1:8000/"
+# END
+
+export MAAS_URL="http://10.4.1.1/MAAS/"
+export APIKEY="c6tcQz4tyS3ALajCtF:sqcWhw8MkxTjUDLZrm:hBhszBLv5EqrY8h6yktFXWUT5825ShvE"
+
+# TODO
+# collect the mac address and BMC detais to add a node into MAAS.
+INTELPOD5SERV1BMCIP=10.4.2.8
+INTELPOD5SERV1MAC1="00:1e:67:e0:0a:4a"
+INTELPOD5SERV1MAC2="00:1e:67:e0:0a:4b"
+INTELPOD5SERV1MAC3="00:1e:67:d0:9a:10"
+INTELPOD5SERV1MAC4="00:1e:67:d0:9a:11"
+
+INTELPOD5SERV2BMCIP=10.4.2.9
+INTELPOD5SERV2MAC1="00:1e:67:e0:08:b0"
+INTELPOD5SERV2MAC2="00:1e:67:e0:08:b1"
+INTELPOD5SERV2MAC3="00:1e:67:d0:99:ee"
+INTELPOD5SERV2MAC4="00:1e:67:d0:99:ef"
+
+INTELPOD5SERV3BMCIP=10.4.2.7
+INTELPOD5SERV3MAC1="00:1e:67:e0:08:7e"
+INTELPOD5SERV3MAC2="00:1e:67:e0:08:7f"
+INTELPOD5SERV3MAC3="00:1e:67:c2:23:d8"
+INTELPOD5SERV3MAC4="00:1e:67:c2:23:d9"
+
+INTELPOD5SERV4BMCIP=10.4.2.10
+INTELPOD5SERV5MAC1="00:1e:67:cf:b8:92"
+INTELPOD5SERV5MAC2="00:1e:67:cf:b8:93"
+INTELPOD5SERV5MAC3="00:1e:67:d0:9b:0c"
+INTELPOD5SERV5MAC4="00:1e:67:d0:9b:0d"
+
+POWERADDRESS="qemu+ssh://user@10.4.1.1/system"
+POWERID1="bootstrap"
+POWERID2="node1"
+POWERID2="node2"
+POWERPASSWORD="Intel.123"
+
+bootstrapMAC1="52:54:00:11:d1:85"
+bootstrapMAC2="52:54:00:61:03:ae"
+
+node1MAC1="52:54:00:1f:dc:44"
+node1MAC2="52:54:00:23:e9:f9"
+
+node2MAC1="52:54:00:08:20:97"
+node2MAC2="52:54:00:af:55:38"
+
+
+# BMC username and password for power management
+INTELPOD5BMCUSERNAME=root
+INTELPOD5BMCPASS=root
+
+# END
+maas login admin $MAAS_URL $APIKEY
+#maas admin nodes list
diff --git a/ci/intel/pod5/master/odl/deploy.sh b/ci/intel/pod5/master/odl/deploy.sh
new file mode 100644
index 00000000..193cbae9
--- /dev/null
+++ b/ci/intel/pod5/master/odl/deploy.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+#placeholder for deployment script.
+set -ex
+
+cp intel/pod5/kilo/master/odl/ovs-odl-tip.yaml ./
+cp intel/pod5/kilo/master/odl/source/*.yaml ./
+
+echo "Deployment Started ...."
+
+JUJU_REPOSITORY=
+juju set-constraints tags=
+juju-deployer -d -r 13 -c ovs-odl-tip.yaml trusty-master-kilo
+
+echo "... Deployment finished"
diff --git a/ci/intel/pod5/master/odl/environment.yaml b/ci/intel/pod5/master/odl/environment.yaml
new file mode 100644
index 00000000..10f7637b
--- /dev/null
+++ b/ci/intel/pod5/master/odl/environment.yaml
@@ -0,0 +1,36 @@
+default: maas
+environments:
+    # https://juju.ubuntu.com/docs/config-maas.html
+    maas:
+        type: maas
+
+        # maas-server specifies the location of the MAAS server. It must
+        # specify the base path.
+        #
+        maas-server: 'http://10.4.1.1/MAAS/'
+
+        # maas-oauth holds the OAuth credentials from MAAS.
+        #
+        maas-oauth: 'c6tcQz4tyS3ALajCtF:sqcWhw8MkxTjUDLZrm:hBhszBLv5EqrY8h6yktFXWUT5825ShvE'
+
+        # maas-server bootstrap ssh connection options
+        #
+
+        # bootstrap-timeout time to wait contacting a state server, in seconds.
+        bootstrap-timeout: 1800
+        admin-secret: admin
+
+        # Whether or not to refresh the list of available updates for an
+        # OS. The default option of true is recommended for use in
+        # production systems, but disabling this can speed up local
+        # deployments for development or testing.
+        #
+        enable-os-refresh-update: false
+
+        # Whether or not to perform OS upgrades when machines are
+        # provisioned. The default option of true is recommended for use
+        # in production systems, but disabling this can speed up local
+        # deployments for development or testing.
+        #
+        enable-os-upgrade: false
+
diff --git a/ci/intel/pod5/master/odl/ha/deploy.sh b/ci/intel/pod5/master/odl/ha/deploy.sh
new file mode 100644
index 00000000..0d54c464
--- /dev/null
+++ b/ci/intel/pod5/master/odl/ha/deploy.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+#placeholder for deployment script.
+set -ex
+
+cp intel/pod5/kilo/master/odl/ha/ovs-odl-tip.yaml ./
+cp intel/pod5/kilo/master/odl/source/*.yaml ./
+
+echo "Deployment Started ...."
+
+JUJU_REPOSITORY=
+juju set-constraints tags=
+juju-deployer -d -r 13 -c ovs-odl-tip.yaml trusty-master-kilo
+
+echo "... Deployment finished"
diff --git a/ci/intel/pod5/master/odl/ha/environment.yaml b/ci/intel/pod5/master/odl/ha/environment.yaml
new file mode 100644
index 00000000..10f7637b
--- /dev/null
+++ b/ci/intel/pod5/master/odl/ha/environment.yaml
@@ -0,0 +1,36 @@
+default: maas
+environments:
+    # https://juju.ubuntu.com/docs/config-maas.html
+    maas:
+        type: maas
+
+        # maas-server specifies the location of the MAAS server. It must
+        # specify the base path.
+        #
+        maas-server: 'http://10.4.1.1/MAAS/'
+
+        # maas-oauth holds the OAuth credentials from MAAS.
+        #
+        maas-oauth: 'c6tcQz4tyS3ALajCtF:sqcWhw8MkxTjUDLZrm:hBhszBLv5EqrY8h6yktFXWUT5825ShvE'
+
+        # maas-server bootstrap ssh connection options
+        #
+
+        # bootstrap-timeout time to wait contacting a state server, in seconds.
+        bootstrap-timeout: 1800
+        admin-secret: admin
+
+        # Whether or not to refresh the list of available updates for an
+        # OS. The default option of true is recommended for use in
+        # production systems, but disabling this can speed up local
+        # deployments for development or testing.
+        #
+        enable-os-refresh-update: false
+
+        # Whether or not to perform OS upgrades when machines are
+        # provisioned. The default option of true is recommended for use
+        # in production systems, but disabling this can speed up local
+        # deployments for development or testing.
+        #
+        enable-os-upgrade: false
+
diff --git a/ci/intel/pod5/master/odl/ha/ovs-odl-tip.yaml b/ci/intel/pod5/master/odl/ha/ovs-odl-tip.yaml
new file mode 100644
index 00000000..f2833635
--- /dev/null
+++ b/ci/intel/pod5/master/odl/ha/ovs-odl-tip.yaml
@@ -0,0 +1,126 @@
+openstack-services:
+  services:
+    ubuntu:
+      branch: "lp:charms/trusty/ubuntu"
+      num_utils: 1
+      constraints: tags=physical
+    neutron-gateway:
+      branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
+      constraints: tags=neutron
+      options:
+        plugin: ovs-odl
+        instance-mtu: 1400
+    nova-compute:
+      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+      num_units: 2
+      constraints: tags=physical
+      options:
+        enable-live-migration: False
+        manage-neutron-plugin-legacy-mode: False
+    neutron-api:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      options:
+        neutron-security-groups: False
+        manage-neutron-plugin-legacy-mode: False
+      to: lxc:ubuntu=0
+    neutron-api-odl:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
+      options:
+        overlay-network-type: 'vxlan gre'
+        security-groups: true
+    odl-controller:
+      branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
+      options:
+        install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
+      to: lxc:ubuntu=0
+    openvswitch-odl:
+      charm: local:trusty/openvswitch-odl
+    mysql:
+      charm: cs:trusty/mysql
+      options:
+        dataset-size: 50%
+        max-connections: 20000
+      to: lxc:ubuntu=0
+    rabbitmq-server:
+      charm: cs:trusty/rabbitmq-server
+      to: lxc:ubuntu=0
+    keystone:
+      charm: cs:trusty/keystone
+      options:
+        admin-password: openstack
+        admin-token: admin
+      to: lxc:ubuntu=0
+    openstack-dashboard:
+      charm: cs:trusty/openstack-dashboard
+      to: lxc:ubuntu=0
+    nova-cloud-controller:
+      charm: cs:trusty/nova-cloud-controller
+      options:
+        network-manager: Neutron
+        quantum-security-groups: "yes"
+      to: lxc:ubuntu=0
+    glance:
+      charm: cs:trusty/glance
+      to: lxc:ubuntu=0
+  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-compute:cloud-compute', 'nova-cloud-controller: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']
+    - ['neutron-api:shared-db', 'mysql:shared-db']
+    - ['neutron-api:amqp', 'rabbitmq-server:amqp']
+    - ['neutron-api:neutron-api', 'nova-cloud-controller: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']
+    - ['neutron-gateway:quantum-network-service', 'nova-cloud-controller:quantum-network-service']
+    - ['openstack-dashboard:identity-service','keystone:identity-service']
+# master
+openstack-master-git:
+  inherits: openstack-services
+  services:
+    keystone:
+      options:
+        openstack-origin-git: include-file://keystone-master.yaml
+    glance:
+      options:
+        openstack-origin-git: include-file://glance-master.yaml
+#    cinder:
+#      options:
+#        openstack-origin-git: include-file://cinder-master.yaml
+#    neutron-api:
+#      options:
+#        openstack-origin-git: include-file://neutron-master.yaml
+    neutron-gateway:
+      options:
+        openstack-origin-git: include-file://neutron-master.yaml
+#    neutron-openvswitch:
+#      options:
+#        openstack-origin-git: include-file://neutron-master.yaml
+    openstack-dashboard:
+      options:
+        openstack-origin-git: include-file://horizon-master.yaml
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+    nova-cloud-controller:
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+trusty-master-kilo:
+  inherits: openstack-master-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo
+    source: cloud:trusty-kilo
diff --git a/ci/intel/pod5/master/odl/ovs-odl-tip.yaml b/ci/intel/pod5/master/odl/ovs-odl-tip.yaml
new file mode 100644
index 00000000..f2833635
--- /dev/null
+++ b/ci/intel/pod5/master/odl/ovs-odl-tip.yaml
@@ -0,0 +1,126 @@
+openstack-services:
+  services:
+    ubuntu:
+      branch: "lp:charms/trusty/ubuntu"
+      num_utils: 1
+      constraints: tags=physical
+    neutron-gateway:
+      branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
+      constraints: tags=neutron
+      options:
+        plugin: ovs-odl
+        instance-mtu: 1400
+    nova-compute:
+      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+      num_units: 2
+      constraints: tags=physical
+      options:
+        enable-live-migration: False
+        manage-neutron-plugin-legacy-mode: False
+    neutron-api:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      options:
+        neutron-security-groups: False
+        manage-neutron-plugin-legacy-mode: False
+      to: lxc:ubuntu=0
+    neutron-api-odl:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
+      options:
+        overlay-network-type: 'vxlan gre'
+        security-groups: true
+    odl-controller:
+      branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
+      options:
+        install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
+      to: lxc:ubuntu=0
+    openvswitch-odl:
+      charm: local:trusty/openvswitch-odl
+    mysql:
+      charm: cs:trusty/mysql
+      options:
+        dataset-size: 50%
+        max-connections: 20000
+      to: lxc:ubuntu=0
+    rabbitmq-server:
+      charm: cs:trusty/rabbitmq-server
+      to: lxc:ubuntu=0
+    keystone:
+      charm: cs:trusty/keystone
+      options:
+        admin-password: openstack
+        admin-token: admin
+      to: lxc:ubuntu=0
+    openstack-dashboard:
+      charm: cs:trusty/openstack-dashboard
+      to: lxc:ubuntu=0
+    nova-cloud-controller:
+      charm: cs:trusty/nova-cloud-controller
+      options:
+        network-manager: Neutron
+        quantum-security-groups: "yes"
+      to: lxc:ubuntu=0
+    glance:
+      charm: cs:trusty/glance
+      to: lxc:ubuntu=0
+  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-compute:cloud-compute', 'nova-cloud-controller: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']
+    - ['neutron-api:shared-db', 'mysql:shared-db']
+    - ['neutron-api:amqp', 'rabbitmq-server:amqp']
+    - ['neutron-api:neutron-api', 'nova-cloud-controller: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']
+    - ['neutron-gateway:quantum-network-service', 'nova-cloud-controller:quantum-network-service']
+    - ['openstack-dashboard:identity-service','keystone:identity-service']
+# master
+openstack-master-git:
+  inherits: openstack-services
+  services:
+    keystone:
+      options:
+        openstack-origin-git: include-file://keystone-master.yaml
+    glance:
+      options:
+        openstack-origin-git: include-file://glance-master.yaml
+#    cinder:
+#      options:
+#        openstack-origin-git: include-file://cinder-master.yaml
+#    neutron-api:
+#      options:
+#        openstack-origin-git: include-file://neutron-master.yaml
+    neutron-gateway:
+      options:
+        openstack-origin-git: include-file://neutron-master.yaml
+#    neutron-openvswitch:
+#      options:
+#        openstack-origin-git: include-file://neutron-master.yaml
+    openstack-dashboard:
+      options:
+        openstack-origin-git: include-file://horizon-master.yaml
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+    nova-cloud-controller:
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+trusty-master-kilo:
+  inherits: openstack-master-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo
+    source: cloud:trusty-kilo
diff --git a/ci/intel/pod5/master/odl/source/cinder-master.yaml b/ci/intel/pod5/master/odl/source/cinder-master.yaml
new file mode 100644
index 00000000..b000d709
--- /dev/null
+++ b/ci/intel/pod5/master/odl/source/cinder-master.yaml
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: master}
+  - {name: cinder,
+     repository: 'git://github.com/openstack/cinder',
+     branch: master}
+directory: /mnt/openstack-git
+#http_proxy: http://squid.internal:3128
+#https_proxy: http://squid.internal:3128
diff --git a/ci/intel/pod5/master/odl/source/glance-master.yaml b/ci/intel/pod5/master/odl/source/glance-master.yaml
new file mode 100644
index 00000000..94a0622b
--- /dev/null
+++ b/ci/intel/pod5/master/odl/source/glance-master.yaml
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: master}
+  - {name: glance,
+     repository: 'git://github.com/openstack/glance',
+     branch: master}
+directory: /mnt/openstack-git
+#http_proxy: http://squid.internal:3128
+#https_proxy: http://squid.internal:3128
diff --git a/ci/intel/pod5/master/odl/source/horizon-master.yaml b/ci/intel/pod5/master/odl/source/horizon-master.yaml
new file mode 100644
index 00000000..0fd7e501
--- /dev/null
+++ b/ci/intel/pod5/master/odl/source/horizon-master.yaml
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: master}
+  - {name: horizon,
+     repository: 'git://github.com/openstack/horizon',
+     branch: master}
+directory: /mnt/openstack-git
+#http_proxy: http://squid.internal:3128
+#https_proxy: http://squid.internal:3128
diff --git a/ci/intel/pod5/master/odl/source/keystone-master.yaml b/ci/intel/pod5/master/odl/source/keystone-master.yaml
new file mode 100644
index 00000000..fb8575de
--- /dev/null
+++ b/ci/intel/pod5/master/odl/source/keystone-master.yaml
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: master}
+  - {name: keystone,
+     repository: 'git://github.com/openstack/keystone',
+     branch: master}
+directory: /mnt/openstack-git
+#http_proxy: http://squid.internal:3128
+#https_proxy: http://squid.internal:3128
diff --git a/ci/intel/pod5/master/odl/source/neutron-master.yaml b/ci/intel/pod5/master/odl/source/neutron-master.yaml
new file mode 100644
index 00000000..ee4c8932
--- /dev/null
+++ b/ci/intel/pod5/master/odl/source/neutron-master.yaml
@@ -0,0 +1,19 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: master}
+  - {name: neutron-fwaas,
+     repository: 'git://github.com/openstack/neutron-fwaas',
+     branch: master}
+  - {name: neutron-lbaas,
+     repository: 'git://github.com/openstack/neutron-lbaas',
+     branch: master}
+  - {name: neutron-vpnaas,
+     repository: 'git://github.com/openstack/neutron-vpnaas',
+     branch: master}
+  - {name: neutron,
+     repository: 'git://github.com/openstack/neutron',
+     branch: master}
+directory: /mnt/openstack-git
+#http_proxy: http://squid.internal:3128
+#https_proxy: http://squid.internal:3128
diff --git a/ci/intel/pod5/master/odl/source/nova-master.yaml b/ci/intel/pod5/master/odl/source/nova-master.yaml
new file mode 100644
index 00000000..0bbee4c3
--- /dev/null
+++ b/ci/intel/pod5/master/odl/source/nova-master.yaml
@@ -0,0 +1,13 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: master}
+  - {name: neutron,
+     repository: 'git://github.com/openstack/neutron',
+     branch: master}
+  - {name: nova,
+     repository: 'git://github.com/openstack/nova',
+     branch: master}
+directory: /mnt/openstack-git
+#http_proxy: http://squid.internal:3128
+#https_proxy: http://squid.internal:3128