Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[OOM] Use cert-initializer truststore instead of hard-coded ONAP Root CA"
[oom.git]
/
kubernetes
/
contrib
/
dns-server-for-vhost-ingress-testing
/
deploy_dns.sh
diff --git
a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
index
657b5f9
..
460c046
100755
(executable)
--- a/
kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
+++ b/
kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
@@
-1,5
+1,5
@@
#!/bin/bash -e
#!/bin/bash -e
-#
+
# Copyright 2020 Samsung Electronics Co., Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Copyright 2020 Samsung Electronics Co., Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@
-70,7
+70,8
@@
ingress_controller_ip() {
deploy() {
local ingress_ip=$(ingress_controller_ip)
deploy() {
local ingress_ip=$(ingress_controller_ip)
- pushd "$SPATH/bind9dns" > /dev/null
+ initdir = $(pwd)
+ cd $SPATH/bind9dns
if [ $# -eq 0 ]; then
local cl_domain="simpledemo.onap.org"
else
if [ $# -eq 0 ]; then
local cl_domain="simpledemo.onap.org"
else
@@
-82,13
+83,15
@@
deploy() {
shift
fi
helm install . --set dnsconf.wildcard="$cl_domain=$ingress_ip" $@
shift
fi
helm install . --set dnsconf.wildcard="$cl_domain=$ingress_ip" $@
- popd > /dev/null
+ cd $initdir
target_machine_notice_info
}
target_machine_notice_info
}
-if [[ $# -eq 1 ]] && [[ $1 == "-h" || $1 == "--help" ]]; then
+if [ $# -eq 1 ] && [ "$1" = "-h" ]; then
+ usage
+elif [ $# -eq 1 ] && [ "$1" = "--help" ]; then
usage
usage
-elif [
[ $# -eq 1 ]] && [[ $1 == "--info" ]
]; then
+elif [
$# -eq 1 ] && [ "$1" = "--info"
]; then
target_machine_notice_info
else
deploy $@
target_machine_notice_info
else
deploy $@