Merge lp:~thedac/openstack-mojo-specs/odl into lp:openstack-mojo-specs

[David Ames]

Add OpenDayLight Deploy

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2537 mojo-openstack-specs for thedac mp294311
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/16353772/
Build: http://10.245.162.36:8080/job/charm_lint_check/2537/

[lp:~thedac/openstack-mojo-specs/odl]

262. By David Ames on 2016-05-11

Lint fixes

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2547 mojo-openstack-specs for thedac mp294311
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2547/

[Liam Young (gnuoy)]

LGTM, thanks

review: Approve

=== added file 'helper/bundles/ovs-odl.yaml'
--- helper/bundles/ovs-odl.yaml	1970-01-01 00:00:00 +0000
+++ helper/bundles/ovs-odl.yaml	2016-05-11 14:49:16 +0000
@@ -0,0 +1,124 @@
+openstack-services:
+  series: trusty
+  services:
+    neutron-gateway:
+      branch: https://github.com/openstack/charm-neutron-gateway
+      options:
+        plugin: ovs-odl
+        instance-mtu: 1400
+    nova-compute:
+      branch: https://github.com/openstack/charm-nova-compute
+      num_units: 3
+      constraints: mem=4G
+      options:
+        enable-live-migration: False
+        manage-neutron-plugin-legacy-mode: False
+    neutron-api:
+      branch: https://github.com/openstack/charm-neutron-api
+      options:
+        neutron-security-groups: True
+        manage-neutron-plugin-legacy-mode: False
+    neutron-api-odl:
+      branch: https://github.com/openstack/charm-neutron-api-odl
+      options:
+        overlay-network-type: 'vxlan gre'
+        security-groups: True
+    odl-controller:
+      branch: https://github.com/openstack/charm-odl-controller
+      options:
+        install-url: "http://10.245.161.162/swift/v1/opendaylight/distribution-karaf-0.2.3-Helium-SR3.tar.gz"
+        http-proxy: "http://squid.internal:3128"
+        https-proxy: "http://squid.internal:3128"
+    openvswitch-odl:
+      branch: https://github.com/openstack/charm-openvswitch-odl
+    mysql:
+      branch: lp:charms/trusty/mysql
+      options:
+        dataset-size: 50%
+    rabbitmq-server:
+      branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
+    keystone:
+      branch: https://github.com/openstack/charm-keystone
+      options:
+        admin-password: openstack
+        admin-token: ubuntutesting
+    openstack-dashboard:
+      branch: https://github.com/openstack/charm-openstack-dashboard
+    nova-cloud-controller:
+      branch: https://github.com/openstack/charm-nova-cloud-controller
+      options:
+        network-manager: Neutron
+    glance:
+      branch: https://github.com/openstack/charm-glance
+  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']
+trusty-liberty:
+  inherits: openstack-services
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-lithium:
+  inherits: trusty-liberty
+  overrides:
+    install-url: "http://10.245.161.162/swift/v1/opendaylight/distribution-karaf-0.3.3-Lithium-SR3.tar.gz"
+    profile: openvswitch-odl-lithium
+trusty-liberty-beryllium:
+  inherits: trusty-liberty
+  overrides:
+    install-url: "http://10.245.161.162/swift/v1/opendaylight/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz"
+    profile: openvswitch-odl-beryllium
+xenial-mitaka-beryllium:
+  inherits: trusty-liberty-beryllium
+  series: xenial
+  overrides:
+    openstack-origin: distro
+    source: distro
+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
+trusty-icehouse-cisco:
+  inherits: trusty-icehouse
+  services:
+    odl-controller:
+      options:
+        install-url: "http://10.245.161.162/swift/v1/opendaylight/distribution-karaf-1.1.0-10009.tar.gz"
+        profile: 'cisco-vpp'
+    nova-compute:
+      options:
+        hugepages: '70%'
+    neutron-api-odl:
+      options:
+        security-groups: False
+  overrides:
+    openstack-origin: ppa:cisco-vpp/icehouse-proposed
+  relations:
+    - [ 'odl-controller:controller-api', 'openvswitch-odl:controller-api' ]

=== added file 'helper/collect/collect-ovs'
--- helper/collect/collect-ovs	1970-01-01 00:00:00 +0000
+++ helper/collect/collect-ovs	2016-05-11 14:49:16 +0000
@@ -0,0 +1,14 @@
+glance                 git://github.com/openstack/charm-glance
+keystone               git://github.com/openstack/charm-keystone
+mysql                  lp:charms/trusty/mysql
+neutron-api            git://github.com/openstack/charm-neutron-api
+neutron-gateway        git://github.com/openstack/charm-neutron-gateway
+neutron-openvswitch    git://github.com/openstack/charm-neutron-openvswitch
+nova-cloud-controller  git://github.com/openstack/charm-nova-cloud-controller
+nova-compute           git://github.com/openstack/charm-nova-compute
+openstack-dashboard    git://github.com/openstack/charm-openstack-dashboard
+rabbitmq-server        git://github.com/openstack/charm-rabbitmq-server
+openvswitch-odl        git://github.com/openstack/charm-openvswitch-odl
+neutron-api-odl        git://github.com/openstack/charm-neutron-api-odl
+odl-controller         git://github.com/openstack/charm-odl-controller
+

=== added directory 'specs/full_stack/odl'
=== added directory 'specs/full_stack/odl/liberty'
=== added file 'specs/full_stack/odl/liberty/SPEC_INFO.txt'
--- specs/full_stack/odl/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/odl/liberty/SPEC_INFO.txt	2016-05-11 14:49:16 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms and then runs tests
+to validate the deployment

=== added symlink 'specs/full_stack/odl/liberty/collect-ovs'
=== target is u'../../../../helper/collect/collect-ovs'
=== added symlink 'specs/full_stack/odl/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/odl/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/odl/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/odl/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/odl/liberty/manifest'
--- specs/full_stack/odl/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/odl/liberty/manifest	2016-05-11 14:49:16 +0000
@@ -0,0 +1,19 @@
+# Collect the charm branches from Launchpad
+collect config=collect-ovs
+
+# Use juju deployer with full.yaml bundle
+deploy config=ovs-odl.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty-beryllium
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="300"
+
+# Success

=== added symlink 'specs/full_stack/odl/liberty/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/odl/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/odl/liberty/ovs-odl.yaml'
=== target is u'../../../../helper/bundles/ovs-odl.yaml'
=== added symlink 'specs/full_stack/odl/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/odl/liberty/utils'
=== target is u'../../../../helper/utils'
=== removed symlink 'specs/full_stack/stable_to_next_ha/icehouse/haphase1.yaml'
=== target was u'../../../../helper/bundles/haphase1.yaml'
=== removed symlink 'specs/full_stack/stable_to_next_ha/icehouse/haphase2.yaml'
=== target was u'../../../../helper/bundles/haphase2.yaml'
=== removed symlink 'specs/full_stack/stable_to_next_ha/icehouse/set_vips.py'
=== target was u'../../../../helper/setup/set_vips.py'
=== removed symlink 'specs/full_stack/stable_to_next_ha/kilo/haphase1.yaml'
=== target was u'../../../../helper/bundles/haphase1.yaml'
=== removed symlink 'specs/full_stack/stable_to_next_ha/kilo/haphase2.yaml'
=== target was u'../../../../helper/bundles/haphase2.yaml'
=== removed symlink 'specs/full_stack/stable_to_next_ha/kilo/set_vips.py'
=== target was u'../../../../helper/setup/set_vips.py'
=== removed symlink 'specs/full_stack/stable_to_next_ha/liberty/haphase1.yaml'
=== target was u'../../../../helper/bundles/haphase1.yaml'
=== removed symlink 'specs/full_stack/stable_to_next_ha/liberty/haphase2.yaml'
=== target was u'../../../../helper/bundles/haphase2.yaml'
=== removed symlink 'specs/full_stack/stable_to_next_ha/liberty/set_vips.py'
=== target was u'../../../../helper/setup/set_vips.py'