ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

config: remove any spaces in public_network or cluster_network 

With two public networks configured - we found that with
"NETWORK_ADDR_1, NETWORK_ADDR_2" install process consistently became
broken, trying to find docker registry on second network, and not
finding mon container.

but without spaces
"NETWORK_ADDR_1,NETWORK_ADDR_2" install succeeds
so, containerized install is more peculiar with formatting of this line

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1534003
Signed-off-by: Sébastien Han <seb@redhat.com>
pull/2365/head
Sébastien Han 2018-01-30 14:39:58 +01:00 committed by Guillaume Abrioux
parent f372a4232e
commit 6f9dd26caa
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all.yml.sample
View File

@ -348,7 +348,7 @@ dummy:
# #
#journal_size: 5120 # OSD journal size in MB #journal_size: 5120 # OSD journal size in MB
#public_network: 0.0.0.0/0 #public_network: 0.0.0.0/0
#cluster_network: "{{ public_network }}" #cluster_network: "{{ public_network | regex_replace(' ', '') }}"
#osd_mkfs_type: xfs #osd_mkfs_type: xfs
#osd_mkfs_options_xfs: -f -i size=2048 #osd_mkfs_options_xfs: -f -i size=2048
#osd_mount_options_xfs: noatime,largeio,inode64,swalloc #osd_mount_options_xfs: noatime,largeio,inode64,swalloc

2
group_vars/rhcs.yml.sample
View File

@ -348,7 +348,7 @@ ceph_repository: rhcs
# #
#journal_size: 5120 # OSD journal size in MB #journal_size: 5120 # OSD journal size in MB
#public_network: 0.0.0.0/0 #public_network: 0.0.0.0/0
#cluster_network: "{{ public_network }}" #cluster_network: "{{ public_network | regex_replace(' ', '') }}"
#osd_mkfs_type: xfs #osd_mkfs_type: xfs
#osd_mkfs_options_xfs: -f -i size=2048 #osd_mkfs_options_xfs: -f -i size=2048
#osd_mount_options_xfs: noatime,largeio,inode64,swalloc #osd_mount_options_xfs: noatime,largeio,inode64,swalloc

4
roles/ceph-config/templates/ceph.conf.j2
View File

@ -112,10 +112,10 @@ mon host = {% if nb_mon > 0 %}
{% endif %} {% endif %}
{% if public_network is defined %} {% if public_network is defined %}
public network = {{ public_network }} public network = {{ public_network | regex_replace(' ', '') }}
{% endif %} {% endif %}
{% if cluster_network is defined %} {% if cluster_network is defined %}
cluster network = {{ cluster_network }} cluster network = {{ cluster_network | regex_replace(' ', '') }}
{% endif %} {% endif %}
{% if rgw_override_bucket_index_max_shards is defined %} {% if rgw_override_bucket_index_max_shards is defined %}
rgw override bucket index max shards = {{ rgw_override_bucket_index_max_shards }} rgw override bucket index max shards = {{ rgw_override_bucket_index_max_shards }}

2
roles/ceph-defaults/defaults/main.yml
View File

@ -340,7 +340,7 @@ mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the
# #
journal_size: 5120 # OSD journal size in MB journal_size: 5120 # OSD journal size in MB
public_network: 0.0.0.0/0 public_network: 0.0.0.0/0
cluster_network: "{{ public_network }}" cluster_network: "{{ public_network | regex_replace(' ', '') }}"
osd_mkfs_type: xfs osd_mkfs_type: xfs
osd_mkfs_options_xfs: -f -i size=2048 osd_mkfs_options_xfs: -f -i size=2048
osd_mount_options_xfs: noatime,largeio,inode64,swalloc osd_mount_options_xfs: noatime,largeio,inode64,swalloc

2
roles/ceph-mon/templates/ceph-mon.service.j2
View File

@ -58,7 +58,7 @@ ExecStart=/usr/bin/docker run --rm --name ceph-mon-%i --net=host \
{%- endif %} {%- endif %}
-e CLUSTER={{ cluster }} \ -e CLUSTER={{ cluster }} \
-e FSID={{ fsid }} \ -e FSID={{ fsid }} \
-e CEPH_PUBLIC_NETWORK={{ public_network }} \ -e CEPH_PUBLIC_NETWORK={{ public_network | regex_replace(' ', '') }} \
-e CEPH_DAEMON=MON \ -e CEPH_DAEMON=MON \
{{ ceph_mon_docker_extra_env }} \ {{ ceph_mon_docker_extra_env }} \
{{ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} {{ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}