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.
att-comdev · Jan 29, 2017 · 0cf9463 · 0cf9463
1 parent f4e3d82
commit 0cf9463
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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 }}
+              cpu: {{ .Values.resources.mon_check.limits.cpu | quote }}
diff --git 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