restructure the directory structure so that we can have directories per

SDN and then we can have same structure for new distro by adding just
the yaml file. Deleted the old file structure.

Change-Id: Ibd544c340fdb53813bc34ee8ff6931ed4b4dee6c
JIRA:JOID-1

10 files changed, 480 insertions, 0 deletions

diff --git a/ci/odl/juju-deployer/odl.yaml b/ci/odl/juju-deployer/odl.yaml
new file mode 100644
index 00000000..f5e6bd73
--- /dev/null
+++ b/ci/odl/juju-deployer/odl.yaml
@@ -0,0 +1,80 @@
+openstack:
+  services:
+    mysql:
+      constraints: mem=1G
+      options:
+        dataset-size: 50%
+        max-connections: 1000
+    rabbitmq-server:
+      constraints: mem=1G
+    keystone:
+      branch: lp:~openstack-charmers/charms/trusty/keystone/next
+      constraints: mem=1G
+    openstack-dashboard:
+      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+      constraints: mem=1G
+    nova-compute:
+      branch: lp:~sdn-charmers/charms/trusty/nova-compute/odl
+      constraints: mem=4G root-disk=20G
+    nova-cloud-controller:
+      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+      constraints: mem=1G
+      options:
+        network-manager: Neutron
+    neutron-api:
+      branch: lp:~sdn-charmers/charms/trusty/neutron-api/odl
+      constraints: mem=1G
+    neutron-gateway:
+      branch: lp:~sdn-charmers/charms/trusty/quantum-gateway/odl
+      constraints: mem=1G
+    glance:
+      branch: lp:~openstack-charmers/charms/trusty/glance/next
+      constraints: mem=1G
+  relations:
+    - [ keystone, mysql ]
+    - [ nova-cloud-controller, mysql ]
+    - [ nova-cloud-controller, rabbitmq-server ]
+    - [ nova-cloud-controller, glance ]
+    - [ nova-cloud-controller, keystone ]
+    - [ neutron-api, mysql ]
+    - [ neutron-api, rabbitmq-server ]
+    - [ neutron-api, keystone ]
+    - [ neutron-api, nova-cloud-controller ]
+    - [ neutron-gateway, mysql ]
+    - [ "neutron-gateway:amqp", "rabbitmq-server:amqp" ]
+    - [ neutron-gateway, nova-cloud-controller ]
+    - [ neutron-gateway, neutron-api ]
+    - [ "nova-compute:shared-db", "mysql:shared-db" ]
+    - [ "nova-compute:amqp", "rabbitmq-server:amqp" ]
+    - [ nova-compute, glance ]
+    - [ nova-compute, nova-cloud-controller ]
+    - [ glance, mysql ]
+    - [ glance, keystone ]
+    - [ openstack-dashboard, keystone ]
+odl:
+  inherits: openstack
+  services:
+    odl-controller:
+      branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
+      constraints: mem=4G
+    neutron-odl:
+      branch: lp:~sdn-charmers/charms/trusty/neutron-odl/trunk
+  relations:
+    - [ neutron-api, odl-controller ]
+    - [ neutron-gateway, odl-controller ]
+    - [ nova-compute, neutron-odl ]
+    - [ neutron-odl, odl-controller ]
+trusty-icehouse-odl:
+  inherits: odl
+  series: trusty
+  services:
+    mysql:
+      charm: cs:trusty/mysql
+    rabbitmq-server:
+      charm: cs:trusty/rabbitmq-server
+  overrides:
+    instance-mtu: 1400
+    neutron-plugin: odl
+    neutron-security-groups: True
+    plugin: odl
+    quantum-security-groups: "yes"
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
new file mode 100644
index 00000000..8da98659
--- /dev/null
+++ b/ci/odl/juju-deployer/ovs-odl-ha.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/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
new file mode 100644
index 00000000..f2833635
--- /dev/null
+++ b/ci/odl/juju-deployer/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/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml
new file mode 100644
index 00000000..8da98659
--- /dev/null
+++ b/ci/odl/juju-deployer/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/odl/juju-deployer/source/cinder-master.yaml b/ci/odl/juju-deployer/source/cinder-master.yaml
new file mode 100644
index 00000000..b000d709
--- /dev/null
+++ b/ci/odl/juju-deployer/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/odl/juju-deployer/source/glance-master.yaml b/ci/odl/juju-deployer/source/glance-master.yaml
new file mode 100644
index 00000000..94a0622b
--- /dev/null
+++ b/ci/odl/juju-deployer/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/odl/juju-deployer/source/horizon-master.yaml b/ci/odl/juju-deployer/source/horizon-master.yaml
new file mode 100644
index 00000000..0fd7e501
--- /dev/null
+++ b/ci/odl/juju-deployer/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/odl/juju-deployer/source/keystone-master.yaml b/ci/odl/juju-deployer/source/keystone-master.yaml
new file mode 100644
index 00000000..fb8575de
--- /dev/null
+++ b/ci/odl/juju-deployer/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/odl/juju-deployer/source/neutron-master.yaml b/ci/odl/juju-deployer/source/neutron-master.yaml
new file mode 100644
index 00000000..ee4c8932
--- /dev/null
+++ b/ci/odl/juju-deployer/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/odl/juju-deployer/source/nova-master.yaml b/ci/odl/juju-deployer/source/nova-master.yaml
new file mode 100644
index 00000000..0bbee4c3
--- /dev/null
+++ b/ci/odl/juju-deployer/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