From d8f9d2dd35030eea965b76f6ccf98a8b4445e63f Mon Sep 17 00:00:00 2001
From: Deokjin Kim <deokjin81.kim@samsung.com>
Date: Mon, 28 Jan 2019 16:04:12 +0900
Subject: [PATCH] Fix wrong chart name and env-variable's name in
 deployment-script

1. Chart name : change from "ceph" to "ceph-rgw"
2. Postfix of environment variable's name
   : change from "OPENSTACK" to "CEPH"

Change-Id: I03a4e12457cec1811b6fa03367811f74e4bb8b83
Signed-off-by: Deokjin Kim <deokjin81.kim@samsung.com>
---
 tools/deployment/developer/ceph/110-ceph-radosgateway.sh | 4 ++--
 tools/deployment/developer/common/030-ingress.sh         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
index 5bc8779f68..3616a7f8c4 100755
--- a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
+++ b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
@@ -17,10 +17,10 @@
 set -xe
 
 #NOTE: Lint and package chart
-make ceph
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${OSH_INFRA_PATH} ceph-rgw
 
 #NOTE: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_EXTRA_HELM_ARGS:=""}
 tee /tmp/radosgw-openstack.yaml <<EOF
 endpoints:
diff --git a/tools/deployment/developer/common/030-ingress.sh b/tools/deployment/developer/common/030-ingress.sh
index 91b34c9993..edd1a30376 100755
--- a/tools/deployment/developer/common/030-ingress.sh
+++ b/tools/deployment/developer/common/030-ingress.sh
@@ -110,7 +110,7 @@ helm status ingress-openstack
 helm upgrade --install ingress-ceph ${OSH_INFRA_PATH}/ingress \
   --namespace=ceph \
   ${OSH_EXTRA_HELM_ARGS} \
-  ${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
+  ${OSH_EXTRA_HELM_ARGS_INGRESS_CEPH}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh ceph