diff --git a/src/metadata.yaml b/src/metadata.yaml index b94a0a3..421f384 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -22,6 +22,9 @@ series: - xenial - bionic - cosmic +extra-bindings: + public: + cluster: subordinate: false provides: nrpe-external-master: diff --git a/src/templates/ceph.conf b/src/templates/ceph.conf index b2b7484..fb7a284 100644 --- a/src/templates/ceph.conf +++ b/src/templates/ceph.conf @@ -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 -%} diff --git a/src/templates/remote.conf b/src/templates/remote.conf index dd91537..64ab359 100644 --- a/src/templates/remote.conf +++ b/src/templates/remote.conf @@ -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 -%}