From 192f02d100285137bc9cbdb02d03e5fa7acdfbe8 Mon Sep 17 00:00:00 2001 From: Chris Wedgwood Date: Fri, 9 Jun 2017 20:21:01 +0000 Subject: [PATCH] [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 --- ceph/README.rst | 2 +- .../utils/secret-generator/templates/ceph/ceph.conf.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ceph/README.rst b/ceph/README.rst index 696c9d332e..f924e9094b 100644 --- a/ceph/README.rst +++ b/ceph/README.rst @@ -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 diff --git a/helm-toolkit/utils/secret-generator/templates/ceph/ceph.conf.tmpl b/helm-toolkit/utils/secret-generator/templates/ceph/ceph.conf.tmpl index 489849ef9f..b7c925bf9f 100644 --- a/helm-toolkit/utils/secret-generator/templates/ceph/ceph.conf.tmpl +++ b/helm-toolkit/utils/secret-generator/templates/ceph/ceph.conf.tmpl @@ -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"}