From 774e0cb654d6a383032aed299a2bfe1aaa8b9739 Mon Sep 17 00:00:00 2001
From: Meg Heisler <mh783g@att.com>
Date: Thu, 8 Nov 2018 11:39:23 -0600
Subject: [PATCH] RGW: Fix multinode deploy for ceph rgw

Change deployment script for rgw to not use the docker
bridge for public and cluster network overrides. Instead,
calculate network values in same way as other ceph multinodes
deployment steps

Change-Id: I2bacd1af1cc331d76a5d61f3b589ca6ef80b1b2e
---
 tools/deployment/multinode/115-radosgw-osh-infra.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/deployment/multinode/115-radosgw-osh-infra.sh b/tools/deployment/multinode/115-radosgw-osh-infra.sh
index d560ecf11..c1ff5a218 100755
--- a/tools/deployment/multinode/115-radosgw-osh-infra.sh
+++ b/tools/deployment/multinode/115-radosgw-osh-infra.sh
@@ -20,6 +20,8 @@ set -xe
 make ceph-rgw
 
 #NOTE: Deploy command
+CEPH_PUBLIC_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)"
+CEPH_CLUSTER_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)"
 tee /tmp/radosgw-osh-infra.yaml <<EOF
 endpoints:
   ceph_object_store:
@@ -27,8 +29,8 @@ endpoints:
   ceph_mon:
     namespace: ceph
 network:
-  public: 172.17.0.1/16
-  cluster: 172.17.0.1/16
+  public: ${CEPH_PUBLIC_NETWORK}
+  cluster: ${CEPH_CLUSTER_NETWORK}
 deployment:
   storage_secrets: false
   ceph: true