openstack
/
charm-ceilometer-agent
Code Issues Proposed changes

Sync charm-helpers and use "rabbit_use_ssl" for ocata 

Ensure "rabbit_use_ssl" is specified in the [oslo_messaging_rabbit]
config section instead of "ssl" for Ocata, since "ssl" was not yet
introduced.

Change-Id: I61f37a976951911d7c24d14cc4ea5e6ec3f84d2e
Closes-Bug: #1838696
This commit is contained in:
Corey Bryant 2019-08-01 22:58:02 -04:00
parent 6a5c75ea20
commit 08758f4e7d
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
charmhelpers/contrib/openstack/ha/utils.py
View File

@ -127,7 +127,9 @@ def expect_ha():
return len(ha_related_units) > 0 or config('vip') or config('dns-ha') return len(ha_related_units) > 0 or config('vip') or config('dns-ha')
def generate_ha_relation_data(service, extra_settings=None): def generate_ha_relation_data(service,
extra_settings=None,
haproxy_enabled=True):
""" Generate relation data for ha relation """ Generate relation data for ha relation
Based on configuration options and unit interfaces, generate a json Based on configuration options and unit interfaces, generate a json
@ -152,21 +154,18 @@ def generate_ha_relation_data(service, extra_settings=None):
@param extra_settings: Dict of additional resource data @param extra_settings: Dict of additional resource data
@returns dict: json encoded data for use with relation_set @returns dict: json encoded data for use with relation_set
""" """
_haproxy_res = 'res_{}_haproxy'.format(service) _relation_data = {'resources': {}, 'resource_params': {}}
_relation_data = {
'resources': { if haproxy_enabled:
_haproxy_res: 'lsb:haproxy', _haproxy_res = 'res_{}_haproxy'.format(service)
}, _relation_data['resources'] = {_haproxy_res: 'lsb:haproxy'}
'resource_params': { _relation_data['resource_params'] = {
_haproxy_res: 'op monitor interval="5s"' _haproxy_res: 'op monitor interval="5s"'
}, }
'init_services': { _relation_data['init_services'] = {_haproxy_res: 'haproxy'}
_haproxy_res: 'haproxy' _relation_data['clones'] = {
},
'clones': {
'cl_{}_haproxy'.format(service): _haproxy_res 'cl_{}_haproxy'.format(service): _haproxy_res
}, }
}
if extra_settings: if extra_settings:
for k, v in extra_settings.items(): for k, v in extra_settings.items():

10
charmhelpers/contrib/openstack/templates/section-oslo-messaging-rabbit-ocata Normal file
View File

@ -0,0 +1,10 @@
[oslo_messaging_rabbit]
{% if rabbitmq_ha_queues -%}
rabbit_ha_queues = True
{% endif -%}
{% if rabbit_ssl_port -%}
rabbit_use_ssl = True
{% endif -%}
{% if rabbit_ssl_ca -%}
ssl_ca_file = {{ rabbit_ssl_ca }}
{% endif -%}

2
templates/ocata/ceilometer.conf
View File

@ -41,4 +41,4 @@ telemetry_secret = {{ metering_secret }}
{% include "section-keystone-authtoken-mitaka" %} {% include "section-keystone-authtoken-mitaka" %}
{% include "section-oslo-messaging-rabbit" %} {% include "section-oslo-messaging-rabbit-ocata" %}