openstack/openstack-helm
Code Issues Proposed changes

Merge "[Ceph] Update default cluster network"

Browse Source
This commit is contained in:
Jenkins
2017-06-09 20:59:45 +00:00
committed by Gerrit Code Review
parent 374752131d 192f02d100
commit eac0cd7115
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ceph/README.rst
View File

@@ -69,7 +69,7 @@ This will not work on:
Override the default network settings
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
By default, ``10.244.0.0/16`` is used for the ``cluster_network`` and
By default, ``192.168.0.0/16`` is used for the ``cluster_network`` and
``public_network`` in ceph.conf. To change these defaults, set the
following environment variables according to your network requirements.
These IPs should be set according to the range of your Pod IPs in your

4
helm-toolkit/utils/secret-generator/templates/ceph/ceph.conf.tmpl
View File

@@ -41,8 +41,8 @@ mon_osd_report_timeout = ${mon_mon_osd_report_timeout:-"300"}
[osd]
journal_size = ${osd_journal_size:-"100"}
cluster_network = ${osd_cluster_network:-'10.244.0.0/16'}
public_network = ${osd_public_network:-'10.244.0.0/16'}
cluster_network = ${osd_cluster_network:-'192.168.0.0/16'}
public_network = ${osd_public_network:-'192.168.0.0/16'}
osd_mkfs_type = ${osd_osd_mkfs_type:-"xfs"}
osd_mkfs_options_xfs = ${osd_osd_mkfs_options_xfs:-"-f -i size=2048"}
osd_mon_heartbeat_interval = ${osd_osd_mon_heartbeat_interval:-"30"}