From 1c2f972e932c9bbb72e47d88df0b0fc9aeda6fcf Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sat, 14 Dec 2019 13:14:21 -0500
Subject: [PATCH] Move Ceph access to storage network

---
 roles/pvc/tasks/ceph/bootstrap.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/pvc/tasks/ceph/bootstrap.yml b/roles/pvc/tasks/ceph/bootstrap.yml
index f6069c9..19ff7a2 100644
--- a/roles/pvc/tasks/ceph/bootstrap.yml
+++ b/roles/pvc/tasks/ceph/bootstrap.yml
@@ -21,7 +21,7 @@
     - "[global]"
     - "fsid = {{ fsid }}"
     - "mon initial members = {% for host in pvc_nodes if host.is_coordinator %}{{ host.hostname }}{% if not loop.last %},{% endif %}{% endfor %}"
-    - "mon host = {% for host in pvc_nodes if host.is_coordinator %}{{ host.cluster_ip }}{% if not loop.last %},{% endif %}{% endfor %}"
+    - "mon host = {% for host in pvc_nodes if host.is_coordinator %}{{ host.storage_ip }}{% if not loop.last %},{% endif %}{% endfor %}"
 
 - name: create temporary directory
   file:
@@ -44,7 +44,7 @@
   command: ceph-authtool /tmp/ceph-bootstrap/ceph.mon.keyring --import-keyring /tmp/ceph-bootstrap/ceph.osd.bootstrap.keyring
 
 - name: create monmap
-  command: monmaptool --create --fsid {{ fsid }} {% for node in pvc_nodes if node.is_coordinator %}--add {{ node.hostname }} {{ node.cluster_ip }} {% endfor %} /tmp/ceph-bootstrap/monmap
+  command: monmaptool --create --fsid {{ fsid }} {% for node in pvc_nodes if node.is_coordinator %}--add {{ node.hostname }} {{ node.storage_ip }} {% endfor %} /tmp/ceph-bootstrap/monmap
 
 - name: copy initial ceph.conf to the boostrap directory
   copy:
@@ -58,7 +58,7 @@
     line: "{{ item }}"
     state: present
   with_items:
-    - "public network = {{ pvc_cluster_subnet }}"
+    - "public network = {{ pvc_storage_subnet }}"
     - "cluster network = {{ pvc_storage_subnet }}"
     - "auth cluster required = cephx"
     - "auth service required = cephx"