From 43fee7bfed9db55d04c34e306378e6f2c7f8518d Mon Sep 17 00:00:00 2001
From: Greg Althaus <galthaus@austin.rr.com>
Date: Mon, 30 Jan 2017 17:16:36 -0600
Subject: [PATCH] CEPH Mons autodetection doesn't work reliably across all
 (#156)

We should use known parameters for the custer POD ips and the MON_IP to make MON IP discovery more consistent.
---
 ceph/templates/statefulset-mon.yaml  | 10 ++++++++--
 ceph/values.yaml                     |  1 +
 docs/installation/getting-started.md |  2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ceph/templates/statefulset-mon.yaml b/ceph/templates/statefulset-mon.yaml
index d7971a72..265dafba 100644
--- a/ceph/templates/statefulset-mon.yaml
+++ b/ceph/templates/statefulset-mon.yaml
@@ -72,10 +72,16 @@ spec:
               value: MON
             - name: KV_TYPE
               value: k8s
-            - name: NETWORK_AUTO_DETECT
-              value: "4"
             - name: CLUSTER
               value: ceph
+            - name: NETWORK_AUTO_DETECT
+              value: "0"
+            - name: CEPH_PUBLIC_NETWORK
+              value: {{ .Values.network.public | quote }}
+            - name: MON_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
           volumeMounts:
             - name: ceph-conf
               mountPath: /etc/ceph
diff --git a/ceph/values.yaml b/ceph/values.yaml
index 2b9a94ab..aa55e644 100644
--- a/ceph/values.yaml
+++ b/ceph/values.yaml
@@ -25,6 +25,7 @@ labels:
   node_selector_value: enabled
 
 network:
+  public: "10.25.0.0/16"
   port: 
     mon: 6789
     rgw_ingress: 80
diff --git a/docs/installation/getting-started.md b/docs/installation/getting-started.md
index 7ee83f80..a0d26172 100644
--- a/docs/installation/getting-started.md
+++ b/docs/installation/getting-started.md
@@ -268,7 +268,7 @@ Please ensure that you use ``--purge`` whenever deleting a project.
 ## Ceph Installation and Verification
 Install the first service, which is Ceph. If all instructions have been followed as mentioned above, this installation should go smoothly. Use the following command to install Ceph:
 ```
-admin@kubenode01:~$ helm install --name=ceph local/ceph --namespace=ceph
+admin@kubenode01:~$ helm install --set network.public=$osd_public_network --name=ceph local/ceph --namespace=ceph
 ```
 
 ## Bootstrap Installation