openstack
/
charm-ceph-rbd-mirror
Code Issues Proposed changes

Add configuration of public/cluster network 

Fix syslog configuration.

Depends-On: Ia49f4921e772376763be178e11d7777676ccc8da
Change-Id: Ic7b0a724052b5d61694993c0728e7e4bdc0d9bfc
This commit is contained in:
Frode Nordahl 2019-03-06 11:09:02 +01:00
parent 2a645e9d0d
commit 64c84334eb
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/metadata.yaml
View File

@ -22,6 +22,9 @@ series:
- xenial
- bionic
- cosmic
extra-bindings:
public:
cluster:
subordinate: false
provides:
nrpe-external-master:

16
src/templates/ceph.conf
View File

@ -9,13 +9,11 @@ auth_supported = {{ ceph_local.auth }}
keyring = /etc/ceph/$cluster.$name.keyring
mon host = {{ ceph_local.monitors }}
{% endif -%}
log to syslog = {{ use_syslog }}
err to syslog = {{ use_syslog }}
clog to syslog = {{ use_syslog }}
log to syslog = {{ options.use_syslog }}
err to syslog = {{ options.use_syslog }}
clog to syslog = {{ options.use_syslog }}
[client]
{% if rbd_client_cache_settings -%}
{% for key, value in rbd_client_cache_settings.items() -%}
{{ key }} = {{ value }}
{% endfor -%}
{%- endif %}
public network = {{ ceph_local.public_network }}
{% if ceph_local.cluster_network %}
cluster network = {{ ceph_local.cluster_network }}
{% endif -%}

16
src/templates/remote.conf
View File

@ -9,13 +9,11 @@ auth_supported = {{ ceph_remote.auth }}
keyring = /etc/ceph/$cluster.$name.keyring
mon host = {{ ceph_remote.monitors }}
{% endif -%}
log to syslog = {{ use_syslog }}
err to syslog = {{ use_syslog }}
clog to syslog = {{ use_syslog }}
log to syslog = {{ options.use_syslog }}
err to syslog = {{ options.use_syslog }}
log to syslog = {{ options.use_syslog }}
[client]
{% if rbd_client_cache_settings -%}
{% for key, value in rbd_client_cache_settings.items() -%}
{{ key }} = {{ value }}
{% endfor -%}
{%- endif %}
public network = {{ ceph_remote.public_network }}
{% if ceph_remote.cluster_network %}
cluster network = {{ ceph_remote.cluster_network }}
{% endif -%}