Updates for queens
Add new charm class for queens, encapsulating the switch to using Py3 with gnocchi. Add version map for queens. Change-Id: I064c4ff8beb5b1b0ce9f7a9cb3597926036b8075
This commit is contained in:
parent
9f9d675741
commit
61d1f4111a
|
@ -222,6 +222,7 @@ class GnocchiCharm(GnochiCharmBase):
|
|||
'gnocchi-common': collections.OrderedDict([
|
||||
('2', 'mitaka'),
|
||||
('3', 'pike'),
|
||||
('4', 'queens'),
|
||||
]),
|
||||
}
|
||||
|
||||
|
@ -251,6 +252,19 @@ class GnocchiCharm(GnochiCharmBase):
|
|||
restart_on_failure=True)
|
||||
|
||||
|
||||
class GnocchiQueensCharm(GnocchiCharm):
|
||||
|
||||
"""
|
||||
Charm for deployment of Gnocchi >= Queens
|
||||
"""
|
||||
|
||||
release = 'queens'
|
||||
|
||||
packages = ['gnocchi-api', 'gnocchi-metricd', 'python3-apt',
|
||||
'ceph-common', 'python3-rados', 'python3-keystonemiddleware',
|
||||
'python3-memcache']
|
||||
|
||||
|
||||
class GnocchiSnapCharm(GnochiCharmBase):
|
||||
|
||||
"""
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
###############################################################################
|
||||
# [ WARNING ]
|
||||
# configuration file maintained by Juju
|
||||
# local changes will be overwritten.
|
||||
###############################################################################
|
||||
[DEFAULT]
|
||||
debug = {{ options.debug }}
|
||||
use_syslog = {{ options.use_syslog }}
|
||||
# NOTE(jamespage): Set sensible log file location for WSGI processes,
|
||||
# other daemons will override using CLI options.
|
||||
log_file = {{ options.log_config }}
|
||||
|
||||
{% if coordinator_memcached.url -%}
|
||||
coordination_url = {{ coordinator_memcached.url }}
|
||||
{%- endif %}
|
||||
|
||||
[api]
|
||||
auth_mode = keystone
|
||||
|
||||
[indexer]
|
||||
{% if shared_db.uri -%}
|
||||
url = {{ shared_db.uri }}
|
||||
{%- endif %}
|
||||
|
||||
[metricd]
|
||||
workers = {{ options.workers }}
|
||||
|
||||
[storage]
|
||||
{% if storage_ceph.key -%}
|
||||
driver = ceph
|
||||
ceph_pool = {{ options.application_name }}
|
||||
ceph_username = {{ options.application_name }}
|
||||
ceph_secret = {{ storage_ceph.key }}
|
||||
ceph_conffile = {{ options.ceph_config }}
|
||||
{%- endif %}
|
||||
|
||||
{% include "parts/section-keystone-authtoken" %}
|
Loading…
Reference in New Issue