From 0cf9463c8a31486d2b4a9cc447fcbff6a8b42747 Mon Sep 17 00:00:00 2001
From: Greg Althaus <galthaus@austin.rr.com>
Date: Sun, 29 Jan 2017 12:46:52 -0600
Subject: [PATCH] Update ceph ansible with some changes for the upstream.
 (#155)

1. fix a container name
2. Fix mds networking parameters.
3. Make rgw not a host network container.
---
 ceph/templates/deployment-mds.yaml      | 2 +-
 ceph/templates/deployment-moncheck.yaml | 6 +++---
 ceph/templates/deployment-rgw.yaml      | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ceph/templates/deployment-mds.yaml b/ceph/templates/deployment-mds.yaml
index 0485c5e7..e2f71811 100644
--- a/ceph/templates/deployment-mds.yaml
+++ b/ceph/templates/deployment-mds.yaml
@@ -32,7 +32,7 @@ spec:
           secret:
             secretName: ceph-bootstrap-rgw-keyring
       containers:
-        - name: ceph-mon
+        - name: ceph-mds
           image: {{ .Values.images.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           ports:
diff --git a/ceph/templates/deployment-moncheck.yaml b/ceph/templates/deployment-moncheck.yaml
index 459074f0..d2d93333 100644
--- a/ceph/templates/deployment-moncheck.yaml
+++ b/ceph/templates/deployment-moncheck.yaml
@@ -42,8 +42,8 @@ spec:
               value: MON_HEALTH
             - name: KV_TYPE
               value: k8s
-            - name: NETWORK_AUTO_DETECT
-              value: "4"
+            - name: MON_IP_AUTO_DETECT
+              value: "1"
             - name: CLUSTER
               value: ceph
           volumeMounts:
@@ -61,4 +61,4 @@ spec:
               cpu: {{ .Values.resources.mon_check.requests.cpu | quote }}
             limits:
               memory: {{ .Values.resources.mon_check.limits.memory | quote }}
-              cpu: {{ .Values.resources.mon_check.limits.cpu | quote }}
\ No newline at end of file
+              cpu: {{ .Values.resources.mon_check.limits.cpu | quote }}
diff --git a/ceph/templates/deployment-rgw.yaml b/ceph/templates/deployment-rgw.yaml
index 57ba1c95..72069d43 100644
--- a/ceph/templates/deployment-rgw.yaml
+++ b/ceph/templates/deployment-rgw.yaml
@@ -16,7 +16,6 @@ spec:
         app: ceph
         daemon: rgw
     spec:
-      hostNetwork: true
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       serviceAccount: default