Currently key value can be used for only global, osd, mon sections. this fix will allow to add key value to rgw section.
Closes-Bug: https://mirantis.jira.com/projects/PROD/issues/PROD-19503
Change-Id: I16d3720a2fd87ac326b69b562ef265ffcd8a3c2a
Signed-off-by: cdodda <cdodda@mirantis.com>
diff --git a/README.rst b/README.rst
index b7cd315..de5a105 100644
--- a/README.rst
+++ b/README.rst
@@ -431,6 +431,10 @@
.. code-block:: yaml
ceph:
+ common:
+ config:
+ rgw:
+ key: value
radosgw:
enabled: true
hostname: gw.ceph.lab
diff --git a/ceph/files/jewel/ceph.conf.Debian b/ceph/files/jewel/ceph.conf.Debian
index 02eccdc..305b3ff 100644
--- a/ceph/files/jewel/ceph.conf.Debian
+++ b/ceph/files/jewel/ceph.conf.Debian
@@ -30,7 +30,7 @@
##Other sections key: value
{%- for key_name, key in common.get('config', {}).iteritems() %}
-{%- if key_name not in ['osd', 'mon', 'global'] %}
+{%- if key_name not in ['rgw', 'osd', 'mon', 'global'] %}
[{{ key_name }}]
{%- for value_name, value in key.iteritems() %}
@@ -131,4 +131,9 @@
{%- endif %}
+##rgw key: value
+{%- for key, value in common.get('config', {}).get('rgw', {}).iteritems() %}
+{{ key }} = {{ value }}
+{%- endfor %}
+
{%- endif %}
diff --git a/ceph/files/kraken/ceph.conf.Debian b/ceph/files/kraken/ceph.conf.Debian
index 02eccdc..305b3ff 100644
--- a/ceph/files/kraken/ceph.conf.Debian
+++ b/ceph/files/kraken/ceph.conf.Debian
@@ -30,7 +30,7 @@
##Other sections key: value
{%- for key_name, key in common.get('config', {}).iteritems() %}
-{%- if key_name not in ['osd', 'mon', 'global'] %}
+{%- if key_name not in ['rgw', 'osd', 'mon', 'global'] %}
[{{ key_name }}]
{%- for value_name, value in key.iteritems() %}
@@ -131,4 +131,9 @@
{%- endif %}
+##rgw key: value
+{%- for key, value in common.get('config', {}).get('rgw', {}).iteritems() %}
+{{ key }} = {{ value }}
+{%- endfor %}
+
{%- endif %}
diff --git a/ceph/files/luminous/ceph.conf.Debian b/ceph/files/luminous/ceph.conf.Debian
index 02eccdc..305b3ff 100644
--- a/ceph/files/luminous/ceph.conf.Debian
+++ b/ceph/files/luminous/ceph.conf.Debian
@@ -30,7 +30,7 @@
##Other sections key: value
{%- for key_name, key in common.get('config', {}).iteritems() %}
-{%- if key_name not in ['osd', 'mon', 'global'] %}
+{%- if key_name not in ['rgw', 'osd', 'mon', 'global'] %}
[{{ key_name }}]
{%- for value_name, value in key.iteritems() %}
@@ -131,4 +131,9 @@
{%- endif %}
+##rgw key: value
+{%- for key, value in common.get('config', {}).get('rgw', {}).iteritems() %}
+{{ key }} = {{ value }}
+{%- endfor %}
+
{%- endif %}