From: Andrew Schoen <aschoen@redhat.com>
Date: Thu, 3 Nov 2016 14:25:03 +0000 (-0500)
Subject: common: remove underscores in ceph.conf so config names are consistent
X-Git-Tag: v2.0~15^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f87aabcb21041749a0f798332bd100125fd85525;p=ceph-ansible.git

common: remove underscores in ceph.conf so config names are consistent

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index fbbb4d87d..25e513369 100644
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -17,7 +17,7 @@ osd crush chooseleaf type = 0
 {% endif %}
 {# NOTE (leseb): the blank lines in-between are needed otherwise we won't get any line break #}
 {% if groups[mon_group_name] is defined %}
-mon_initial_members = {% if groups[mon_group_name] is defined %}{% for host in groups[mon_group_name] %}{% if hostvars[host]['ansible_fqdn'] is defined and mon_use_fqdn %}{{ hostvars[host]['ansible_fqdn'] }}{% if not loop.last %},{% endif %}{% elif hostvars[host]['ansible_hostname'] is defined %}{{ hostvars[host]['ansible_hostname'] }}{% if not loop.last %},{% endif %}{% endif %}{% endfor %}{% endif %}
+mon initial members = {% if groups[mon_group_name] is defined %}{% for host in groups[mon_group_name] %}{% if hostvars[host]['ansible_fqdn'] is defined and mon_use_fqdn %}{{ hostvars[host]['ansible_fqdn'] }}{% if not loop.last %},{% endif %}{% elif hostvars[host]['ansible_hostname'] is defined %}{{ hostvars[host]['ansible_hostname'] }}{% if not loop.last %},{% endif %}{% endif %}{% endfor %}{% endif %}
 {% endif %}
 
 {% if not mon_containerized_deployment and not mon_containerized_deployment_with_kv %}
@@ -60,10 +60,10 @@ monitor_address
 {% endif %}
 
 {% if public_network is defined %}
-public_network = {{ public_network }}
+public network = {{ public_network }}
 {% endif %}
 {% if cluster_network is defined %}
-cluster_network = {{ cluster_network }}
+cluster network = {{ cluster_network }}
 {% endif %}
 
 [client.libvirt]