From 3e7af01510a062958e3d0913f39db1bf2dd99b43 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Thu, 2 Nov 2017 09:01:50 +0000
Subject: [PATCH] Fix version maps for snaps and debs

This ensures that charms don't try to upgrade themselves everytime
an update-status hook call occurs; specifically we need to map the
numerical version to the latest OpenStack release that carries
that version for the UCA.

Gnocchi does always major release with OpenStack.

Change-Id: I777097c5188c73523fc4c41fc698b6dc6a87fd24
---
 src/lib/charm/openstack/gnocchi.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/lib/charm/openstack/gnocchi.py b/src/lib/charm/openstack/gnocchi.py
index 6c57fe3..fe8d9d2 100644
--- a/src/lib/charm/openstack/gnocchi.py
+++ b/src/lib/charm/openstack/gnocchi.py
@@ -221,8 +221,7 @@ class GnocchiCharm(GnochiCharmBase):
     package_codenames = {
         'gnocchi-common': collections.OrderedDict([
             ('2', 'mitaka'),
-            ('3', 'newton'),
-            ('4', 'pike'),
+            ('3', 'pike'),
         ]),
     }
 
@@ -275,8 +274,7 @@ class GnocchiSnapCharm(GnochiCharmBase):
 
     snap_codenames = {
         'gnocchi': collections.OrderedDict([
-            ('2', 'mitaka'),
-            ('3', 'newton'),
+            ('3', 'ocata'),
             ('4', 'pike'),
         ]),
     }