Merge lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-mitakatastic into lp:openstack-mojo-specs

[Liam Young]

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

charm_lint_check #17854 mojo-openstack-specs for gnuoy mp283441
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/17854/

=== modified file 'helper/bundles/full.yaml'
--- helper/bundles/full.yaml	2015-08-05 08:40:27 +0000
+++ helper/bundles/full.yaml	2016-01-21 13:19:38 +0000
@@ -277,6 +277,12 @@
   overrides:
     openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
     source: ppa:ubuntu-cloud-archive/liberty-staging
+trusty-mitaka:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-mitaka/proposed
+    source: cloud:trusty-mitaka
 wily-liberty:
   inherits: openstack-icehouse
   series: wily

=== modified file 'helper/bundles/ha.yaml'
--- helper/bundles/ha.yaml	2015-11-02 17:05:14 +0000
+++ helper/bundles/ha.yaml	2016-01-21 13:19:38 +0000
@@ -256,3 +256,26 @@
 vivid-kilo-ha:
   inherits: openstack-services
   series: vivid
+trusty-mitaka-ha:
+  inherits: openstack-services
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-mitaka/proposed
+    source: cloud:trusty-mitaka
+trusty-mitaka-proposed:
+  inherits: openstack-services
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-mitaka/proposed
+    source: cloud:trusty-mitaka/proposed
+xenial-mitaka-ha:
+  inherits: openstack-services
+  series: xenial
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql
+xenial-mitaka-proposed:
+  inherits: xenial-mitaka
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed

=== modified file 'helper/scripts/mojo-spec-check.py'
--- helper/scripts/mojo-spec-check.py	2015-10-20 03:18:37 +0000
+++ helper/scripts/mojo-spec-check.py	2016-01-21 13:19:38 +0000
@@ -24,7 +24,8 @@
     'icehouse': ['precise', 'trusty'],
     'juno': ['trusty'],
     'kilo': ['trusty', 'vivid'],
-    'liberty': ['trusty', 'wily']
+    'liberty': ['trusty', 'wily'],
+    'mitaka': ['trusty', 'xenial'],
 }
 
 

=== modified file 'helper/setup/upgrade_openstack.py'
--- helper/setup/upgrade_openstack.py	2015-10-13 14:19:50 +0000
+++ helper/setup/upgrade_openstack.py	2016-01-21 13:19:38 +0000
@@ -1,21 +1,15 @@
 #!/usr/bin/python
+import six
+import re
 import argparse
 import sys
 import utils.mojo_utils as mojo_utils
 import logging
-from collections import OrderedDict
-
-OPENSTACK_CODENAMES = OrderedDict([
-    ('2011.2', 'diablo'),
-    ('2012.1', 'essex'),
-    ('2012.2', 'folsom'),
-    ('2013.1', 'grizzly'),
-    ('2013.2', 'havana'),
-    ('2014.1', 'icehouse'),
-    ('2014.2', 'juno'),
-    ('2015.1', 'kilo'),
-    ('2015.2', 'liberty'),
-])
+from utils.os_versions import (
+    OPENSTACK_CODENAMES,
+    SWIFT_CODENAMES,
+    PACKAGE_CODENAMES,
+)
 
 CHARM_TYPES = {
     'neutron': {
@@ -60,15 +54,43 @@
     {'name': 'ceilometer', 'type': CHARM_TYPES['ceilometer']},
 ]
 
-
-def get_os_code_info(pkg_version):
-    for entry in OPENSTACK_CODENAMES:
-        if entry in pkg_version:
-            return {'code_num': entry, 'code_name': OPENSTACK_CODENAMES[entry]}
+# XXX get_swift_codename and get_os_code_info are based on the functions with
+# the same name in ~charm-helpers/charmhelpers/contrib/openstack/utils.py
+# It'd be neat if we actually shared a common library.
+
+
+def get_swift_codename(version):
+    '''Determine OpenStack codename that corresponds to swift version.'''
+    codenames = [k for k, v in six.iteritems(SWIFT_CODENAMES) if version in v]
+    return codenames[0]
+
+
+def get_os_code_info(package, pkg_version):
+    # {'code_num': entry, 'code_name': OPENSTACK_CODENAMES[entry]}
+    pkg_version = pkg_version.split(':')[1:][0]
+    if 'swift' in package:
+        # Fully x.y.z match for swift versions
+        match = re.match('^(\d+)\.(\d+)\.(\d+)', pkg_version)
+    else:
+        # x.y match only for 20XX.X
+        # and ignore patch level for other packages
+        match = re.match('^(\d+)\.(\d+)', pkg_version)
+
+    if match:
+        pkg_version = match.group(0)
+    if (package in PACKAGE_CODENAMES and
+            pkg_version in PACKAGE_CODENAMES[package]):
+        return PACKAGE_CODENAMES[package][pkg_version]
+    else:
+        # < Liberty co-ordinated project versions
+        if 'swift' in package:
+            return get_swift_codename(pkg_version)
+        else:
+            return OPENSTACK_CODENAMES[pkg_version]
 
 
 def next_release(release):
-    old_index = OPENSTACK_CODENAMES.keys().index(release)
+    old_index = OPENSTACK_CODENAMES.values().index(release)
     new_index = old_index + 1
     return OPENSTACK_CODENAMES.items()[new_index]
 
@@ -80,14 +102,15 @@
             continue
         version = mojo_utils.get_pkg_version(service['name'],
                                              service['type']['pkg'])
-        versions[service['name']] = get_os_code_info(version)
+        versions[service['name']] = get_os_code_info(service['type']['pkg'],
+                                                     version)
     return versions
 
 
 def get_lowest_os_version(current_versions):
-    lowest_version = {'code_num': '2100', 'code_name': 'zebra'}
+    lowest_version = 'zebra'
     for svc in current_versions.keys():
-        if current_versions[svc]['code_name'] < lowest_version['code_name']:
+        if current_versions[svc] < lowest_version:
             lowest_version = current_versions[svc]
     return lowest_version
 
@@ -95,7 +118,7 @@
 def get_upgrade_targets(target_release, current_versions):
     upgrade_list = []
     for svc in current_versions.keys():
-        if current_versions[svc]['code_name'] < target_release:
+        if current_versions[svc] < target_release:
             upgrade_list.append(svc)
     return upgrade_list
 
@@ -116,7 +139,7 @@
         # If in auto mode find the lowest value openstack release across all
         # services and make sure all servcies are upgraded to one release
         # higher than the lowest
-        lowest_release = get_lowest_os_version(current_versions)['code_num']
+        lowest_release = get_lowest_os_version(current_versions)
         target_release = next_release(lowest_release)[1]
     # Get a list of services that need upgrading
     needs_upgrade = get_upgrade_targets(target_release, current_versions)
@@ -132,8 +155,10 @@
         logging.info('Upgrading {} to {}'.format(service['name'],
                                                  target_release))
         ubuntu_version = mojo_utils.get_ubuntu_version(service['name'])
-        option = "{}=cloud:{}-{}".format(service['type']['origin_setting'],
-                                         ubuntu_version, target_release)
+        option = "{}=cloud:{}-{}/proposed".format(
+            service['type']['origin_setting'],
+            ubuntu_version, target_release
+        )
         mojo_utils.juju_set(service['name'], option, wait=True)
 
 if __name__ == "__main__":

=== added file 'helper/utils/os_versions.py'
--- helper/utils/os_versions.py	1970-01-01 00:00:00 +0000
+++ helper/utils/os_versions.py	2016-01-21 13:19:38 +0000
@@ -0,0 +1,105 @@
+from collections import OrderedDict
+
+OPENSTACK_CODENAMES = OrderedDict([
+    ('2011.2', 'diablo'),
+    ('2012.1', 'essex'),
+    ('2012.2', 'folsom'),
+    ('2013.1', 'grizzly'),
+    ('2013.2', 'havana'),
+    ('2014.1', 'icehouse'),
+    ('2014.2', 'juno'),
+    ('2015.1', 'kilo'),
+    ('2015.2', 'liberty'),
+    ('2016.1', 'mitaka'),
+])
+
+UBUNTU_OPENSTACK_RELEASE = OrderedDict([
+    ('oneiric', 'diablo'),
+    ('precise', 'essex'),
+    ('quantal', 'folsom'),
+    ('raring', 'grizzly'),
+    ('saucy', 'havana'),
+    ('trusty', 'icehouse'),
+    ('utopic', 'juno'),
+    ('vivid', 'kilo'),
+    ('wily', 'liberty'),
+    ('xenial', 'mitaka'),
+])
+
+
+OPENSTACK_CODENAMES = OrderedDict([
+    ('2011.2', 'diablo'),
+    ('2012.1', 'essex'),
+    ('2012.2', 'folsom'),
+    ('2013.1', 'grizzly'),
+    ('2013.2', 'havana'),
+    ('2014.1', 'icehouse'),
+    ('2014.2', 'juno'),
+    ('2015.1', 'kilo'),
+    ('2015.2', 'liberty'),
+    ('2016.1', 'mitaka'),
+])
+
+# The ugly duckling - must list releases oldest to newest
+SWIFT_CODENAMES = OrderedDict([
+    ('diablo',
+        ['1.4.3']),
+    ('essex',
+        ['1.4.8']),
+    ('folsom',
+        ['1.7.4']),
+    ('grizzly',
+        ['1.7.6', '1.7.7', '1.8.0']),
+    ('havana',
+        ['1.9.0', '1.9.1', '1.10.0']),
+    ('icehouse',
+        ['1.11.0', '1.12.0', '1.13.0', '1.13.1']),
+    ('juno',
+        ['2.0.0', '2.1.0', '2.2.0']),
+    ('kilo',
+        ['2.2.1', '2.2.2']),
+    ('liberty',
+        ['2.3.0', '2.4.0', '2.5.0']),
+    ('mitaka',
+        ['2.5.0']),
+])
+
+# >= Liberty version->codename mapping
+PACKAGE_CODENAMES = {
+    'nova-common': OrderedDict([
+        ('12.0', 'liberty'),
+        ('13.0', 'mitaka'),
+    ]),
+    'neutron-common': OrderedDict([
+        ('7.0', 'liberty'),
+        ('8.0', 'mitaka'),
+    ]),
+    'cinder-common': OrderedDict([
+        ('7.0', 'liberty'),
+        ('8.0', 'mitaka'),
+    ]),
+    'keystone': OrderedDict([
+        ('8.0', 'liberty'),
+        ('9.0', 'mitaka'),
+    ]),
+    'horizon-common': OrderedDict([
+        ('8.0', 'liberty'),
+        ('9.0', 'mitaka'),
+    ]),
+    'ceilometer-common': OrderedDict([
+        ('5.0', 'liberty'),
+        ('6.0', 'mitaka'),
+    ]),
+    'heat-common': OrderedDict([
+        ('5.0', 'liberty'),
+        ('6.0', 'mitaka'),
+    ]),
+    'glance-common': OrderedDict([
+        ('11.0', 'liberty'),
+        ('12.0', 'mitaka'),
+    ]),
+    'openstack-dashboard': OrderedDict([
+        ('8.0', 'liberty'),
+        ('9.0', 'mitaka'),
+    ]),
+}

=== added directory 'specs/full_stack/next_deploy/mitaka'
=== added file 'specs/full_stack/next_deploy/mitaka/SPEC_INFO.txt'
--- specs/full_stack/next_deploy/mitaka/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy/mitaka/SPEC_INFO.txt	2016-01-21 13:19:38 +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/next_deploy/mitaka/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_deploy/mitaka/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_deploy/mitaka/collect-next-xenial'
=== target is u'../../../../helper/collect/collect-next-wily'
=== added symlink 'specs/full_stack/next_deploy/mitaka/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/next_deploy/mitaka/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_deploy/mitaka/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_deploy/mitaka/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_deploy/mitaka/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_deploy/mitaka/manifest'
--- specs/full_stack/next_deploy/mitaka/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_deploy/mitaka/manifest	2016-01-21 13:19:38 +0000
@@ -0,0 +1,22 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-${MOJO_SERIES}
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# 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='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+
+# Success

=== added symlink 'specs/full_stack/next_deploy/mitaka/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_deploy/mitaka/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_deploy/mitaka/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_deploy/mitaka/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/next_ha_oneshot/mitaka'
=== added file 'specs/full_stack/next_ha_oneshot/mitaka/SPEC_INFO.txt'
--- specs/full_stack/next_ha_oneshot/mitaka/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_ha_oneshot/mitaka/SPEC_INFO.txt	2016-01-21 13:19:38 +0000
@@ -0,0 +1,3 @@
+This spec performs a ha deploy in one shot (not phased) then runs tests to
+validate the deployment. The assumption is that the version of juju has
+leadership enabled.

=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/ha.yaml'
=== target is u'../../../../helper/bundles/ha.yaml'
=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_ha_oneshot/mitaka/manifest'
--- specs/full_stack/next_ha_oneshot/mitaka/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_ha_oneshot/mitaka/manifest	2016-01-21 13:19:38 +0000
@@ -0,0 +1,31 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Use juju deployer to create the units for the deployment
+deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka-ha
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Examine the available networks and set vips for services need updates to support this
+#script config=set_vips.py
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# 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='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Success

=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/utils'
=== target is u'../../../../helper/utils'
=== added directory 'specs/full_stack/next_openstack_upgrade/liberty'
=== added file 'specs/full_stack/next_openstack_upgrade/liberty/SPEC_INFO.txt'
--- specs/full_stack/next_openstack_upgrade/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_openstack_upgrade/liberty/SPEC_INFO.txt	2016-01-21 13:19:38 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the next charms and then upgrades
+to the next version of openstack

=== added symlink 'specs/full_stack/next_openstack_upgrade/liberty/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_openstack_upgrade/liberty/collect-next-trusty'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_openstack_upgrade/liberty/collect-next-wily'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_openstack_upgrade/liberty/full.yaml'
=== target is u'../../../../helper/bundles/full.yaml'
=== added symlink 'specs/full_stack/next_openstack_upgrade/liberty/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_openstack_upgrade/liberty/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_openstack_upgrade/liberty/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_openstack_upgrade/liberty/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_openstack_upgrade/liberty/manifest'
--- specs/full_stack/next_openstack_upgrade/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_openstack_upgrade/liberty/manifest	2016-01-21 13:19:38 +0000
@@ -0,0 +1,28 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-${MOJO_SERIES}
+
+# Use juju deployer with full.yaml bundle
+deploy config=full.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# 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='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
+
+# Upgrade Openstack
+script config=upgrade_openstack.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
+
+# Success

=== added symlink 'specs/full_stack/next_openstack_upgrade/liberty/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_openstack_upgrade/liberty/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_openstack_upgrade/liberty/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_openstack_upgrade/liberty/upgrade_openstack.py'
=== target is u'../../../../helper/setup/upgrade_openstack.py'
=== added symlink 'specs/full_stack/next_openstack_upgrade/liberty/utils'
=== target is u'../../../../helper/utils'