[Ceph] Update default cluster network

The current default network for ceph works for very few people by
default.  Update it to match what most people seem to be using.

Change-Id: Icd5f87189b067865721203065e8caf33772d56ba
This commit is contained in:
Chris Wedgwood 2017-06-09 20:21:01 +00:00
parent a3972f6e5d
commit 192f02d100
2 changed files with 3 additions and 3 deletions
ceph
helm-toolkit/utils/secret-generator/templates/ceph

@ -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

@ -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"}