Merge lp:~zulcss/charm-helpers/ocata-support into lp:charm-helpers

[Chuck Short]

Add support for ocata.

[James Page (james-page)]

Hi Chuck

I think there are potentially some version maps that need updating for the semantic versions for openstack projects?

Or that might already be done.

[James Page (james-page)]

Ignore me they are already done.

[James Page (james-page)]

review: Approve

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2016-10-10 12:07:38 +0000
+++ charmhelpers/contrib/openstack/utils.py	2016-11-11 18:12:58 +0000
@@ -109,7 +109,7 @@
     ('wily', 'liberty'),
     ('xenial', 'mitaka'),
     ('yakkety', 'newton'),
-    ('zebra', 'ocata'),  # TODO: upload with real Z name
+    ('zesty', 'ocata'),
 ])
 
 
@@ -547,6 +547,9 @@
             'newton': 'xenial-updates/newton',
             'newton/updates': 'xenial-updates/newton',
             'newton/proposed': 'xenial-proposed/newton',
+            'zesty': 'zesty-updates/ocata',
+            'zesty/updates': 'xenial-updates/ocata',
+            'zesty/proposed': 'xenial-proposed/ocata',
         }
 
         try:

=== modified file 'charmhelpers/fetch/ubuntu.py'
--- charmhelpers/fetch/ubuntu.py	2016-09-20 17:07:51 +0000
+++ charmhelpers/fetch/ubuntu.py	2016-11-11 18:12:58 +0000
@@ -105,6 +105,14 @@
     'newton/proposed': 'xenial-proposed/newton',
     'xenial-newton/proposed': 'xenial-proposed/newton',
     'xenial-proposed/newton': 'xenial-proposed/newton',
+    # Ocata
+    'ocata': 'xenial-updates/ocata',
+    'xenial-octata': 'xenial-updates/ocata',
+    'xenial-ocata/updates': 'xenial-updates/ocata',
+    'xenial-updates/ocata': 'xenial-updates/ocata',
+    'ocata/proposed': 'xenial-proposed/ocata',
+    'xenial-ocata/proposed': 'xenial-proposed/ocata',
+    'xenial-ocata/newton': 'xenial-proposed/ocata',
 }
 
 APT_NO_LOCK = 100  # The return code for "couldn't acquire lock" in APT.