summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitrii Shcherbakov <dmitrii.shcherbakov@canonical.com>2017-08-02 01:06:43 +0300
committerDmitrii Shcherbakov <dmitrii.shcherbakov@canonical.com>2017-08-02 01:15:48 +0300
commit747a17117a62ad2a7008d97df1aa22a35b3c3825 (patch)
treecc2d52563493a8f05d2060ea338c0e4e8a9703f3
parent50ea0566c888063ffc4b03a2cc0313d3b214bddb (diff)
use a default release selector, add more codenames
If a default selector is not used, get_charm_instance provides release=None to the __init__ of a charm class which results in an exception down the road in core.py in charms.openstack.
-rw-r--r--src/lib/charm/openstack/panko.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/charm/openstack/panko.py b/src/lib/charm/openstack/panko.py
index 9eb748a..8eed99c 100644
--- a/src/lib/charm/openstack/panko.py
+++ b/src/lib/charm/openstack/panko.py
@@ -31,6 +31,9 @@ PANKO_WSGI_CONF = '/etc/apache2/sites-available/{}.conf'.format(
31 PANKO_APACHE_SITE) 31 PANKO_APACHE_SITE)
32 32
33 33
34charms_openstack.charm.use_defaults('charm.default-select-release')
35
36
34class PankoCharmRelationAdapters(adapters.OpenStackAPIRelationAdapters): 37class PankoCharmRelationAdapters(adapters.OpenStackAPIRelationAdapters):
35 relation_adapters = { 38 relation_adapters = {
36 'shared_db': adapters.DatabaseRelationAdapter, 39 'shared_db': adapters.DatabaseRelationAdapter,
@@ -81,7 +84,12 @@ class PankoCharm(charms_openstack.charm.HAOpenStackCharm):
81 84
82 package_codenames = { 85 package_codenames = {
83 'panko-common': collections.OrderedDict([ 86 'panko-common': collections.OrderedDict([
84 ('4', 'pike'), 87 ('2', 'mitaka'),
88 ('3', 'newton'),
89 ('4', 'ocata'),
90 ('5', 'pike'),
91 ('6', 'queens'),
92 ('7', 'rocky'),
85 ]), 93 ]),
86 } 94 }
87 95