k2hr3-api 1.0.11 → 1.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ChangeLog +24 -0
- package/app.js +7 -4
- package/bin/run.sh +218 -172
- package/bin/watcher +7 -4
- package/bin/www +7 -4
- package/config/default.json +7 -4
- package/config/development.json +7 -4
- package/config/dummyuser.json +8 -5
- package/config/extdata-dummy.sh.templ +12 -9
- package/config/k2hr3-cloud-config.txt.templ +7 -4
- package/config/k2hr3-init-error.sh.templ +8 -5
- package/config/k2hr3-init.sh.templ +127 -207
- package/config/keystone_v2.json +7 -4
- package/config/keystone_v3.json +7 -4
- package/lib/basicipcheck.js +7 -4
- package/lib/cacerts.js +7 -4
- package/lib/dbglogging.js +7 -4
- package/lib/dummyuserapi.js +7 -4
- package/lib/ipwatch.js +7 -4
- package/lib/k2hr3acrutil.js +7 -5
- package/lib/k2hr3apiutil.js +7 -4
- package/lib/k2hr3cliutil.js +7 -4
- package/lib/k2hr3config.js +7 -4
- package/lib/k2hr3cryptutil.js +7 -4
- package/lib/k2hr3dkc.js +7 -4
- package/lib/k2hr3extdata.js +7 -4
- package/lib/k2hr3keys.js +7 -4
- package/lib/k2hr3resutil.js +7 -4
- package/lib/k2hr3template.js +7 -4
- package/lib/k2hr3tokens.js +7 -4
- package/lib/k2hr3userdata.js +8 -5
- package/lib/k8soidc.js +1 -1
- package/lib/openstackapiv2.js +7 -4
- package/lib/openstackapiv3.js +7 -4
- package/lib/openstackep.js +7 -4
- package/package.json +73 -72
- package/routes/acr.js +7 -4
- package/routes/debugVerify.js +7 -4
- package/routes/extdata.js +7 -4
- package/routes/list.js +7 -4
- package/routes/policy.js +7 -4
- package/routes/resource.js +7 -4
- package/routes/role.js +7 -4
- package/routes/service.js +7 -4
- package/routes/userTokens.js +7 -4
- package/routes/userdata.js +7 -4
- package/routes/version.js +7 -4
- package/templ/Dockerfile.templ +35 -52
- package/{test → tests}/auto_acr.js +7 -4
- package/{test → tests}/auto_acr_spec.js +7 -4
- package/{test → tests}/auto_all_spec.js +7 -4
- package/{test → tests}/auto_common.js +7 -4
- package/tests/auto_control_subprocess.sh +239 -0
- package/{test → tests}/auto_extdata.js +7 -4
- package/{test → tests}/auto_extdata_spec.js +7 -4
- package/tests/auto_init_config_json.sh +275 -0
- package/{test → tests}/auto_k2hdkc_server.ini +7 -4
- package/{test → tests}/auto_k2hdkc_slave.ini +7 -4
- package/{test → tests}/auto_list.js +7 -4
- package/{test → tests}/auto_list_spec.js +7 -4
- package/{test → tests}/auto_policy.js +7 -4
- package/{test → tests}/auto_policy_spec.js +7 -4
- package/{test → tests}/auto_resource.js +7 -4
- package/{test → tests}/auto_resource_spec.js +7 -4
- package/{test → tests}/auto_role.js +7 -4
- package/{test → tests}/auto_role_spec.js +7 -4
- package/{test → tests}/auto_service.js +7 -4
- package/{test → tests}/auto_service_spec.js +7 -4
- package/{test → tests}/auto_subprocesses.js +14 -11
- package/tests/auto_template.sh +126 -0
- package/{test → tests}/auto_token_util.js +7 -4
- package/{test → tests}/auto_userdata.js +7 -4
- package/{test → tests}/auto_userdata_spec.js +7 -4
- package/{test → tests}/auto_usertokens.js +7 -4
- package/{test → tests}/auto_usertokens_spec.js +7 -4
- package/{test → tests}/auto_version.js +7 -4
- package/{test → tests}/auto_version_spec.js +7 -4
- package/{test → tests}/auto_watcher.js +7 -4
- package/{test → tests}/auto_watcher_spec.js +7 -4
- package/{test → tests}/k2hdkc_test.data +7 -4
- package/tests/k2hdkc_test_load.sh +255 -0
- package/{test → tests}/k2hr3template_test.js +7 -4
- package/tests/k2hr3template_test.sh +339 -0
- package/{test → tests}/k2hr3template_test_async.js +7 -4
- package/{test → tests}/k2hr3template_test_template.result +14 -8
- package/{test → tests}/k2hr3template_test_template.txt +7 -4
- package/{test → tests}/k2hr3template_test_vars.js +7 -4
- package/{test → tests}/manual_acr_delete.js +7 -4
- package/{test → tests}/manual_acr_get.js +7 -4
- package/{test → tests}/manual_acr_postput.js +7 -4
- package/{test → tests}/manual_allusertenant_get.js +7 -4
- package/{test → tests}/manual_extdata_get.js +7 -4
- package/{test → tests}/manual_k2hr3keys_get.js +7 -4
- package/{test → tests}/manual_list_gethead.js +7 -4
- package/{test → tests}/manual_policy_delete.js +7 -4
- package/{test → tests}/manual_policy_gethead.js +7 -4
- package/{test → tests}/manual_policy_postput.js +7 -4
- package/{test → tests}/manual_resource_delete.js +7 -4
- package/{test → tests}/manual_resource_gethead.js +7 -4
- package/{test → tests}/manual_resource_postput.js +7 -4
- package/{test → tests}/manual_role_delete.js +7 -4
- package/{test → tests}/manual_role_gethead.js +7 -4
- package/{test → tests}/manual_role_postput.js +7 -4
- package/{test → tests}/manual_service_delete.js +7 -4
- package/{test → tests}/manual_service_gethead.js +7 -4
- package/{test → tests}/manual_service_postput.js +7 -4
- package/tests/manual_test.sh +338 -0
- package/{test → tests}/manual_userdata_get.js +7 -4
- package/{test → tests}/manual_usertoken_gethead.js +7 -4
- package/{test → tests}/manual_usertoken_postput.js +7 -4
- package/{test → tests}/manual_version_get.js +7 -4
- package/tests/run_local_test_k2hdkc.sh +174 -0
- package/tests/test.sh +331 -0
- package/test/auto_control_subprocess.sh +0 -170
- package/test/auto_init_config_json.sh +0 -246
- package/test/auto_template.sh +0 -127
- package/test/auto_test.sh +0 -321
- package/test/k2hdkc_test_load.sh +0 -198
- package/test/k2hr3template_test.sh +0 -296
- package/test/manual_test.sh +0 -321
- package/test/run_local_test_k2hdkc.sh +0 -154
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
#
|
|
3
3
|
# K2HR3 REST API
|
|
4
4
|
#
|
|
5
|
-
# Copyright 2018 Yahoo
|
|
5
|
+
# Copyright 2018 Yahoo Japan Corporation.
|
|
6
6
|
#
|
|
7
7
|
# K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers
|
|
8
8
|
# common management information for the cloud.
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
#----------------------------------------------------------
|
|
22
22
|
# Sudo command
|
|
23
23
|
#----------------------------------------------------------
|
|
24
|
-
CURRENTUSER
|
|
25
|
-
if [ "
|
|
24
|
+
CURRENTUSER=$(id -un)
|
|
25
|
+
if [ -n "${CURRENTUSER}" ] && [ "${CURRENTUSER}" = "root" ]; then
|
|
26
26
|
SUDOCMD=""
|
|
27
27
|
else
|
|
28
28
|
SUDOCMD="sudo"
|
|
@@ -81,7 +81,7 @@ output_raw()
|
|
|
81
81
|
#
|
|
82
82
|
_LOCAL_LEVEL=$1
|
|
83
83
|
shift
|
|
84
|
-
echo "
|
|
84
|
+
echo "$(date '+%Y-%m-%d %H:%M:%S,%3N') - ${SCRIPTNAME}${_LOCAL_LEVEL}: $*" | "${SUDOCMD}" tee -a "${LOGFILE}"
|
|
85
85
|
}
|
|
86
86
|
|
|
87
87
|
exit_err()
|
|
@@ -112,106 +112,43 @@ check_os()
|
|
|
112
112
|
# PKGMGR_UPDATE_OPT
|
|
113
113
|
# PKGMGR_LIST_CMD
|
|
114
114
|
#
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
PKGMGR_BIN="yum"
|
|
128
|
-
PKGMGR_UPDATE_OPT="update -y"
|
|
129
|
-
PKGMGR_LIST_CMD="yum list installed"
|
|
130
|
-
fi
|
|
115
|
+
|
|
116
|
+
. /etc/os-release
|
|
117
|
+
|
|
118
|
+
if [ -z "${ID}" ]; then
|
|
119
|
+
exit_err "Unknown OS distribution."
|
|
120
|
+
fi
|
|
121
|
+
if [ "${ID}" = "centos" ]; then
|
|
122
|
+
if [ -z "${VERSION_ID}" ] || [ "${VERSION_ID}" -eq 7 ]; then
|
|
123
|
+
IS_OS_DEBIAN=0
|
|
124
|
+
PKGMGR_BIN="yum"
|
|
125
|
+
PKGMGR_UPDATE_OPT="update -y"
|
|
126
|
+
PKGMGR_LIST_CMD="yum list installed"
|
|
131
127
|
else
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
137
|
-
PKGMGR_LIST_CMD="dnf list installed"
|
|
138
|
-
else
|
|
139
|
-
_OS_DIST="CentOS 7 or older(package manager yum)"
|
|
140
|
-
PKGMGR_BIN="yum"
|
|
141
|
-
PKGMGR_UPDATE_OPT="update -y"
|
|
142
|
-
PKGMGR_LIST_CMD="yum list installed"
|
|
143
|
-
fi
|
|
128
|
+
IS_OS_DEBIAN=0
|
|
129
|
+
PKGMGR_BIN="dnf"
|
|
130
|
+
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
131
|
+
PKGMGR_LIST_CMD="dnf list installed"
|
|
144
132
|
fi
|
|
145
|
-
elif [
|
|
146
|
-
_OS_DIST="Redhat(package manager yum)"
|
|
133
|
+
elif [ "${ID}" = "rocky" ]; then
|
|
147
134
|
IS_OS_DEBIAN=0
|
|
148
|
-
PKGMGR_BIN="
|
|
149
|
-
PKGMGR_UPDATE_OPT="update -y"
|
|
150
|
-
PKGMGR_LIST_CMD="
|
|
135
|
+
PKGMGR_BIN="dnf"
|
|
136
|
+
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
137
|
+
PKGMGR_LIST_CMD="dnf list installed"
|
|
151
138
|
|
|
152
|
-
elif [
|
|
153
|
-
_OS_DIST="Fedora(package manager dnf)"
|
|
139
|
+
elif [ "${ID}" = "fedora" ]; then
|
|
154
140
|
IS_OS_DEBIAN=0
|
|
155
141
|
PKGMGR_BIN="dnf"
|
|
156
142
|
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
157
143
|
PKGMGR_LIST_CMD="dnf list installed"
|
|
158
144
|
|
|
159
|
-
elif [
|
|
160
|
-
_OS_DIST="Debian(package manager apt)"
|
|
145
|
+
elif [ "${ID}" = "ubuntu" ]; then
|
|
161
146
|
IS_OS_DEBIAN=1
|
|
162
147
|
PKGMGR_BIN="apt-get"
|
|
163
148
|
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
164
149
|
PKGMGR_LIST_CMD="apt list --installed"
|
|
165
150
|
|
|
166
|
-
elif [
|
|
167
|
-
_OS_ID=`cat /etc/os-release | grep -e '^ID=' -e '^ID_LIKE=' | sed -e 's/ID=//g' -e 's/ID_LIKE=//g' -e 's/"//g'`
|
|
168
|
-
echo ${_OS_ID} | grep -e '[cC][eE][nN][tT][oO][sS]' >/dev/null 2>&1
|
|
169
|
-
if [ $? -eq 0 ]; then
|
|
170
|
-
_OS_VERSION=`cat /etc/os-release | grep '^VERSION_ID=' | sed -e 's/VERSION_ID=//g' -e 's/"//g'`
|
|
171
|
-
IS_OS_DEBIAN=0
|
|
172
|
-
if [ "X${_OS_VERSION}" = "X8" ]; then
|
|
173
|
-
_OS_DIST="CentOS 8(package manager dnf)"
|
|
174
|
-
PKGMGR_BIN="dnf"
|
|
175
|
-
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
176
|
-
PKGMGR_LIST_CMD="dnf list installed"
|
|
177
|
-
else
|
|
178
|
-
_OS_DIST="CentOS 7 or older(package manager yum)"
|
|
179
|
-
PKGMGR_BIN="yum"
|
|
180
|
-
PKGMGR_UPDATE_OPT="update -y"
|
|
181
|
-
PKGMGR_LIST_CMD="yum list installed"
|
|
182
|
-
fi
|
|
183
|
-
else
|
|
184
|
-
echo ${_OS_ID} | grep -e '[rR][hH][eE][lL]' >/dev/null 2>&1
|
|
185
|
-
if [ $? -eq 0 ]; then
|
|
186
|
-
_OS_DIST="Redhat(package manager yum)"
|
|
187
|
-
IS_OS_DEBIAN=0
|
|
188
|
-
PKGMGR_BIN="yum"
|
|
189
|
-
PKGMGR_UPDATE_OPT="update -y"
|
|
190
|
-
PKGMGR_LIST_CMD="yum list installed"
|
|
191
|
-
else
|
|
192
|
-
echo ${_OS_ID} | grep -e '[fF][eE][dD][oO][rR][aA]' >/dev/null 2>&1
|
|
193
|
-
if [ $? -eq 0 ]; then
|
|
194
|
-
_OS_DIST="Fedora(package manager dnf)"
|
|
195
|
-
IS_OS_DEBIAN=0
|
|
196
|
-
PKGMGR_BIN="dnf"
|
|
197
|
-
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
198
|
-
PKGMGR_LIST_CMD="dnf list installed"
|
|
199
|
-
else
|
|
200
|
-
echo ${_OS_ID} | grep -e '[uU][bB][uU][nN][tT][uU]' -e '[dD][eE][bB][iI][aA][nN]' >/dev/null 2>&1
|
|
201
|
-
if [ $? -eq 0 ]; then
|
|
202
|
-
_OS_DIST="Debian or Ubuntu(package manager apt)"
|
|
203
|
-
IS_OS_DEBIAN=1
|
|
204
|
-
PKGMGR_BIN="apt-get"
|
|
205
|
-
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
206
|
-
PKGMGR_LIST_CMD="apt list --installed"
|
|
207
|
-
else
|
|
208
|
-
exit_err "Unknown OS distribution."
|
|
209
|
-
fi
|
|
210
|
-
fi
|
|
211
|
-
fi
|
|
212
|
-
fi
|
|
213
|
-
elif [ -f /etc/lsb-release ]; then
|
|
214
|
-
_OS_DIST="Debian or Ubuntu(package manager apt)"
|
|
151
|
+
elif [ "${ID}" = "debian" ]; then
|
|
215
152
|
IS_OS_DEBIAN=1
|
|
216
153
|
PKGMGR_BIN="apt-get"
|
|
217
154
|
PKGMGR_UPDATE_OPT="update -y -qq"
|
|
@@ -219,7 +156,7 @@ check_os()
|
|
|
219
156
|
else
|
|
220
157
|
exit_err "Unknown OS distribution."
|
|
221
158
|
fi
|
|
222
|
-
output_info "OS is ${
|
|
159
|
+
output_info "OS is ${PRETTY_NAME}"
|
|
223
160
|
return 0
|
|
224
161
|
}
|
|
225
162
|
|
|
@@ -228,12 +165,10 @@ check_os()
|
|
|
228
165
|
#
|
|
229
166
|
update_package_local_db()
|
|
230
167
|
{
|
|
231
|
-
if [ ${IS_UPDATE_PKG_LOCAL_DB} -ne 0 ]; then
|
|
168
|
+
if [ "${IS_UPDATE_PKG_LOCAL_DB}" -ne 0 ]; then
|
|
232
169
|
return 0
|
|
233
170
|
fi
|
|
234
|
-
|
|
235
|
-
${SUDOCMD} ${PKGMGR_BIN} ${PKGMGR_UPDATE_OPT}
|
|
236
|
-
if [ $? -ne 0 ]; then
|
|
171
|
+
if ! /bin/sh -c "${SUDOCMD} ${PKGMGR_BIN} ${PKGMGR_UPDATE_OPT}"; then
|
|
237
172
|
exit_err "Failed updating packages before installing curl"
|
|
238
173
|
fi
|
|
239
174
|
output_info "Success updating package repository caches"
|
|
@@ -246,8 +181,7 @@ update_package_local_db()
|
|
|
246
181
|
#
|
|
247
182
|
check_curl()
|
|
248
183
|
{
|
|
249
|
-
curl
|
|
250
|
-
if [ $? -eq 0 ]; then
|
|
184
|
+
if command -v curl >/dev/null 2>&1; then
|
|
251
185
|
output_info "curl is already installed."
|
|
252
186
|
return 0
|
|
253
187
|
fi
|
|
@@ -256,8 +190,7 @@ check_curl()
|
|
|
256
190
|
update_package_local_db
|
|
257
191
|
|
|
258
192
|
# Install curl
|
|
259
|
-
${SUDOCMD} ${PKGMGR_BIN} install ${PKGMGR_INSTALL_OPT} curl
|
|
260
|
-
if [ $? -ne 0 ]; then
|
|
193
|
+
if ! /bin/sh -c "${SUDOCMD} ${PKGMGR_BIN} install ${PKGMGR_INSTALL_OPT} curl"; then
|
|
261
194
|
exit_err "Failed installing curl"
|
|
262
195
|
fi
|
|
263
196
|
output_info "Success installing curl"
|
|
@@ -274,16 +207,20 @@ check_create_file()
|
|
|
274
207
|
# $2: value
|
|
275
208
|
# $3: file mode
|
|
276
209
|
#
|
|
277
|
-
_LOCAL_CC_FILE
|
|
278
|
-
_LOCAL_CC_VALUE
|
|
210
|
+
_LOCAL_CC_FILE="$1"
|
|
211
|
+
_LOCAL_CC_VALUE="$2"
|
|
279
212
|
if [ $# -gt 2 ]; then
|
|
280
|
-
_LOCAL_CC_MODE
|
|
213
|
+
_LOCAL_CC_MODE="$3"
|
|
281
214
|
else
|
|
282
215
|
_LOCAL_CC_MODE=0644
|
|
283
216
|
fi
|
|
284
217
|
|
|
285
|
-
if [ -f ${_LOCAL_CC_FILE} ]; then
|
|
286
|
-
_LOCAL_CC_TMP
|
|
218
|
+
if [ -f "${_LOCAL_CC_FILE}" ]; then
|
|
219
|
+
_LOCAL_CC_TMP=$(tr -d '\n' < "${_LOCAL_CC_FILE}" 2>/dev/null)
|
|
220
|
+
|
|
221
|
+
# [NOTE]
|
|
222
|
+
# Since the condition becomes complicated, use "X"(temporary word).
|
|
223
|
+
#
|
|
287
224
|
if [ "X${_LOCAL_CC_TMP}" = "X${_LOCAL_CC_VALUE}" ]; then
|
|
288
225
|
# Same value, thus nothing to do
|
|
289
226
|
return 0
|
|
@@ -291,14 +228,12 @@ check_create_file()
|
|
|
291
228
|
fi
|
|
292
229
|
|
|
293
230
|
# Put file
|
|
294
|
-
|
|
295
|
-
if [ $? -ne 0 ]; then
|
|
231
|
+
if ! printf '%s' "${_LOCAL_CC_VALUE}" >"${_LOCAL_CC_FILE}" 2>/dev/null; then
|
|
296
232
|
exit_err "Could not put the value to ${_LOCAL_CC_FILE}"
|
|
297
233
|
fi
|
|
298
234
|
|
|
299
235
|
# file permit
|
|
300
|
-
chmod ${_LOCAL_CC_MODE} ${_LOCAL_CC_FILE} 2>/dev/null
|
|
301
|
-
if [ $? -ne 0 ]; then
|
|
236
|
+
if ! chmod "${_LOCAL_CC_MODE}" "${_LOCAL_CC_FILE}" 2>/dev/null; then
|
|
302
237
|
exit_err "Could not change mode ${_LOCAL_CC_MODE} to ${_LOCAL_CC_FILE}"
|
|
303
238
|
fi
|
|
304
239
|
output_info "Succeed to save the value to ${_LOCAL_CC_FILE}"
|
|
@@ -314,11 +249,13 @@ load_value_with_default()
|
|
|
314
249
|
# $1: file path
|
|
315
250
|
# $2: default value
|
|
316
251
|
#
|
|
317
|
-
if [ ! -f $1 ]; then
|
|
252
|
+
if [ -z "$1" ] || [ ! -f "$1" ]; then
|
|
318
253
|
_RESULT_VALUE="$2"
|
|
319
254
|
else
|
|
320
|
-
|
|
321
|
-
|
|
255
|
+
if ! _RESULT_VALUE=$(tr -d '\n' < "$1" 2>/dev/null); then
|
|
256
|
+
_RESULT_VALUE="$2"
|
|
257
|
+
fi
|
|
258
|
+
if [ -z "${_RESULT_VALUE}" ]; then
|
|
322
259
|
_RESULT_VALUE="$2"
|
|
323
260
|
fi
|
|
324
261
|
fi
|
|
@@ -331,16 +268,15 @@ load_value_with_default()
|
|
|
331
268
|
#
|
|
332
269
|
setup_packagecloudio_repo()
|
|
333
270
|
{
|
|
334
|
-
if [ ${SETUP_PC_REPO} -eq 1 ]; then
|
|
271
|
+
if [ "${SETUP_PC_REPO}" -eq 1 ]; then
|
|
335
272
|
return 0
|
|
336
273
|
fi
|
|
337
|
-
if [ ${IS_OS_DEBIAN} -eq 1 ]; then
|
|
274
|
+
if [ "${IS_OS_DEBIAN}" -eq 1 ]; then
|
|
338
275
|
_SCRIPT_NAME="script.deb.sh"
|
|
339
276
|
else
|
|
340
277
|
_SCRIPT_NAME="script.rpm.sh"
|
|
341
278
|
fi
|
|
342
|
-
curl -s https://packagecloud.io/install/repositories/antpickax/stable
|
|
343
|
-
if [ $? -ne 0 ]; then
|
|
279
|
+
if ! curl -s https://packagecloud.io/install/repositories/antpickax/stable/"${_SCRIPT_NAME}" | "${SUDOCMD}" bash; then
|
|
344
280
|
exit_err "Could not setup packagecloud.io repository."
|
|
345
281
|
fi
|
|
346
282
|
SETUP_PC_REPO=1
|
|
@@ -365,8 +301,7 @@ is_install_package()
|
|
|
365
301
|
update_package_local_db
|
|
366
302
|
|
|
367
303
|
# Check package installed
|
|
368
|
-
${SUDOCMD} ${PKGMGR_LIST_CMD} | sed 's/\./ /g' | awk '{print $1}' | grep "^$1$"
|
|
369
|
-
if [ $? -ne 0 ]; then
|
|
304
|
+
if ! /bin/sh -c "${SUDOCMD} ${PKGMGR_LIST_CMD}" | sed 's/\./ /g' | awk '{print $1}' | grep -q "^$1$"; then
|
|
370
305
|
# package is not installed.
|
|
371
306
|
return 1
|
|
372
307
|
fi
|
|
@@ -388,13 +323,11 @@ install_package()
|
|
|
388
323
|
update_package_local_db
|
|
389
324
|
|
|
390
325
|
# check package installed
|
|
391
|
-
is_install_package ${_TMP_INSTALL_PKGNAME}
|
|
392
|
-
if [ $? -eq 0 ]; then
|
|
326
|
+
if is_install_package "${_TMP_INSTALL_PKGNAME}"; then
|
|
393
327
|
output_info "${_TMP_INSTALL_PKGNAME} pacakge is already installed."
|
|
394
328
|
else
|
|
395
329
|
# Install package
|
|
396
|
-
${SUDOCMD} ${PKGMGR_BIN} install ${PKGMGR_INSTALL_OPT} ${_TMP_INSTALL_PKGNAME} >/dev/null 2>&1
|
|
397
|
-
if [ $? -ne 0 ]; then
|
|
330
|
+
if ! /bin/sh -c "${SUDOCMD} ${PKGMGR_BIN} install ${PKGMGR_INSTALL_OPT} ${_TMP_INSTALL_PKGNAME}" >/dev/null 2>&1; then
|
|
398
331
|
exit_err "Failed installing ${_TMP_INSTALL_PKGNAME} package"
|
|
399
332
|
fi
|
|
400
333
|
output_info "Success installing ${_TMP_INSTALL_PKGNAME} pacakge"
|
|
@@ -413,35 +346,33 @@ get_install_packages()
|
|
|
413
346
|
#
|
|
414
347
|
_INSTALL_PKGS_PC=0
|
|
415
348
|
if [ $# -gt 3 ]; then
|
|
416
|
-
if [ $4 -eq 1 ]; then
|
|
349
|
+
if [ -n "$4" ] && [ "$4" -eq 1 ]; then
|
|
417
350
|
_INSTALL_PKGS_PC=1
|
|
418
351
|
fi
|
|
419
352
|
fi
|
|
420
353
|
|
|
421
354
|
# Try to get key's value in resource
|
|
422
|
-
_GET_RESULT
|
|
423
|
-
if [ $? -ne 0 ]; then
|
|
355
|
+
if ! _GET_RESULT=$(curl -s -S -X GET -H "Content-Type: application/json" -H "$1" "$2" 2>&1); then
|
|
424
356
|
output_info "There is no keyname($3), then no package is installed."
|
|
425
357
|
return 0
|
|
426
358
|
fi
|
|
427
359
|
|
|
428
360
|
# Check response(expect -> "result": true)
|
|
429
|
-
echo ${_GET_RESULT} | tr '[:lower:]' '[:upper:]' | grep '["]*RESULT["]*:[[:space:]]*TRUE[[:space:]]*,'
|
|
430
|
-
if [ $? -ne 0 ]; then
|
|
361
|
+
if ! echo "${_GET_RESULT}" | tr '[:lower:]' '[:upper:]' | grep -q '["]*RESULT["]*:[[:space:]]*TRUE[[:space:]]*,'; then
|
|
431
362
|
# Get error message(expect -> "message": "...")
|
|
432
|
-
_GET_RESULT_MSG
|
|
363
|
+
_GET_RESULT_MSG=$(echo "${_GET_RESULT}" | sed -e 's/^.*["]*[mM][eE][sS][sS][aA][gG][eE]["]*:[[:space:]]*//g' -e 's/["],.*$//g' -e 's/}.*//g' -e 's/"//g')
|
|
433
364
|
output_info "There is no keyname($3) with response(${_GET_RESULT_MSG}), then no package is installed."
|
|
434
365
|
return 0
|
|
435
366
|
fi
|
|
436
367
|
output_info "Success getting keyname($3) value."
|
|
437
368
|
|
|
438
369
|
# setup packakecloud.io repository
|
|
439
|
-
if [ ${_INSTALL_PKGS_PC} -eq 1 ]; then
|
|
370
|
+
if [ "${_INSTALL_PKGS_PC}" -eq 1 ]; then
|
|
440
371
|
setup_packagecloudio_repo
|
|
441
372
|
fi
|
|
442
373
|
|
|
443
374
|
# pacakges
|
|
444
|
-
INSTALL_PKGS
|
|
375
|
+
INSTALL_PKGS=$(echo "${_GET_RESULT}" | sed -e 's/^.*["]*[rR][eE][sS][oO][uU][rR][cC][eE]["]*:[[:space:]]*//g' -e 's/["],.*$//g' -e 's/}.*//g' -e 's/"//g' -e 's/,/ /g')
|
|
445
376
|
for _package in ${INSTALL_PKGS}; do
|
|
446
377
|
install_package "${_package}"
|
|
447
378
|
done
|
|
@@ -462,33 +393,28 @@ start_systemd_service()
|
|
|
462
393
|
#
|
|
463
394
|
|
|
464
395
|
# Try to get key's value in resource
|
|
465
|
-
_GET_RESULT
|
|
466
|
-
if [ $? -ne 0 ]; then
|
|
396
|
+
if ! _GET_RESULT=$(curl -s -S -X GET -H "Content-Type: application/json" -H "$1" "$2" 2>&1); then
|
|
467
397
|
output_info "There is no keyname($3), then no package is installed."
|
|
468
398
|
return 0
|
|
469
399
|
fi
|
|
470
400
|
|
|
471
401
|
# Check response(expect -> "result": true)
|
|
472
|
-
echo ${_GET_RESULT} | tr '[:lower:]' '[:upper:]' | grep '["]*RESULT["]*:[[:space:]]*TRUE[[:space:]]*,'
|
|
473
|
-
if [ $? -ne 0 ]; then
|
|
402
|
+
if ! echo "${_GET_RESULT}" | tr '[:lower:]' '[:upper:]' | grep -q '["]*RESULT["]*:[[:space:]]*TRUE[[:space:]]*,'; then
|
|
474
403
|
# Get error message(expect -> "message": "...")
|
|
475
|
-
_GET_RESULT_MSG
|
|
404
|
+
_GET_RESULT_MSG=$(echo "${_GET_RESULT}" | sed -e 's/^.*["]*[mM][eE][sS][sS][aA][gG][eE]["]*:[[:space:]]*//g' -e 's/["],.*$//g' -e 's/}.*//g' -e 's/"//g')
|
|
476
405
|
output_info "There is no keyname($3) with response(${_GET_RESULT_MSG}), then no package is installed."
|
|
477
406
|
return 0
|
|
478
407
|
fi
|
|
479
408
|
output_info "Success getting keyname($3) value."
|
|
480
409
|
|
|
481
410
|
# pacakges
|
|
482
|
-
_TMP_LIST_PKGS
|
|
411
|
+
_TMP_LIST_PKGS=$(echo "${_GET_RESULT}" | sed -e 's/^.*["]*[rR][eE][sS][oO][uU][rR][cC][eE]["]*:[[:space:]]*//g' -e 's/["],.*$//g' -e 's/}.*//g' -e 's/"//g' -e 's/,/ /g')
|
|
483
412
|
|
|
484
413
|
# check and start/enable systemd service
|
|
485
414
|
for _package in ${_TMP_LIST_PKGS}; do
|
|
486
|
-
${SUDOCMD} systemctl is-active ${_package} >/dev/null 2>&1
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
if [ $? -ne 0 ]; then
|
|
490
|
-
${SUDOCMD} systemctl enable ${_package} >/dev/null 2>&1
|
|
491
|
-
if [ $? -ne 0 ]; then
|
|
415
|
+
if ! "${SUDOCMD}" systemctl is-active "${_package}" >/dev/null 2>&1; then
|
|
416
|
+
if ! "${SUDOCMD}" systemctl is-enabled "${_package}" >/dev/null 2>&1; then
|
|
417
|
+
if ! "${SUDOCMD}" systemctl enable "${_package}" >/dev/null 2>&1; then
|
|
492
418
|
output_warn "Could not enable ${_package} systemd(pacakge)"
|
|
493
419
|
else
|
|
494
420
|
output_info "Success enable ${_package} systemd(pacakge)"
|
|
@@ -497,8 +423,7 @@ start_systemd_service()
|
|
|
497
423
|
output_info "${_package} systemd(pacakge) is aready enabled."
|
|
498
424
|
fi
|
|
499
425
|
|
|
500
|
-
${SUDOCMD} systemctl start ${_package} >/dev/null 2>&1
|
|
501
|
-
if [ $? -ne 0 ]; then
|
|
426
|
+
if ! "${SUDOCMD}" systemctl start "${_package}" >/dev/null 2>&1; then
|
|
502
427
|
output_warn "Could not start ${_package} systemd(pacakge)"
|
|
503
428
|
else
|
|
504
429
|
output_info "Success start ${_package} systemd(pacakge)"
|
|
@@ -522,46 +447,41 @@ stop_systemd_service()
|
|
|
522
447
|
#
|
|
523
448
|
|
|
524
449
|
# Try to get key's value in resource
|
|
525
|
-
_GET_RESULT
|
|
526
|
-
if [ $? -ne 0 ]; then
|
|
450
|
+
if ! _GET_RESULT=$(curl -s -S -X GET -H "Content-Type: application/json" -H "$1" "$2" 2>&1); then
|
|
527
451
|
output_info "There is no keyname($3), then no package is installed."
|
|
528
452
|
return 0
|
|
529
453
|
fi
|
|
530
454
|
|
|
531
455
|
# Check response(expect -> "result": true)
|
|
532
|
-
echo ${_GET_RESULT} | tr '[:lower:]' '[:upper:]' | grep '["]*RESULT["]*:[[:space:]]*TRUE[[:space:]]*,'
|
|
533
|
-
if [ $? -ne 0 ]; then
|
|
456
|
+
if ! echo "${_GET_RESULT}" | tr '[:lower:]' '[:upper:]' | grep -q '["]*RESULT["]*:[[:space:]]*TRUE[[:space:]]*,'; then
|
|
534
457
|
# Get error message(expect -> "message": "...")
|
|
535
|
-
_GET_RESULT_MSG
|
|
458
|
+
_GET_RESULT_MSG=$(echo "${_GET_RESULT}" | sed -e 's/^.*["]*[mM][eE][sS][sS][aA][gG][eE]["]*:[[:space:]]*//g' -e 's/["],.*$//g' -e 's/}.*//g' -e 's/"//g')
|
|
536
459
|
output_info "There is no keyname($3) with response(${_GET_RESULT_MSG}), then no package is installed."
|
|
537
460
|
return 0
|
|
538
461
|
fi
|
|
539
462
|
output_info "Success getting keyname($3) value."
|
|
540
463
|
|
|
541
464
|
# pacakges
|
|
542
|
-
_TMP_LIST_PKGS
|
|
465
|
+
_TMP_LIST_PKGS=$(echo "${_GET_RESULT}" | sed -e 's/^.*["]*[rR][eE][sS][oO][uU][rR][cC][eE]["]*:[[:space:]]*//g' -e 's/["],.*$//g' -e 's/}.*//g' -e 's/"//g' -e 's/,/ /g')
|
|
543
466
|
|
|
544
467
|
# make reverse list
|
|
545
|
-
_TMP_REV_LIST_PKGS=
|
|
468
|
+
_TMP_REV_LIST_PKGS=""
|
|
546
469
|
for _package in ${_TMP_LIST_PKGS}; do
|
|
547
470
|
_TMP_REV_LIST_PKGS="${_package} ${_TMP_REV_LIST_PKGS}"
|
|
548
471
|
done
|
|
549
472
|
|
|
550
473
|
# check and stop systemd service
|
|
551
474
|
for _package in ${_TMP_REV_LIST_PKGS}; do
|
|
552
|
-
${SUDOCMD} systemctl is-active ${_package} >/dev/null 2>&1
|
|
553
|
-
if [ $? -ne 0 ]; then
|
|
475
|
+
if ! "${SUDOCMD}" systemctl is-active "${_package}" >/dev/null 2>&1; then
|
|
554
476
|
output_info "${_package}(pacakge) is not active as systemd.service(timer) or not systemd.service(timer), then skip it."
|
|
555
477
|
else
|
|
556
|
-
${SUDOCMD} systemctl stop ${_package} >/dev/null 2>&1
|
|
557
|
-
if [ $? -ne 0 ]; then
|
|
478
|
+
if ! "${SUDOCMD}" systemctl stop "${_package}" >/dev/null 2>&1; then
|
|
558
479
|
output_warn "Could not stop ${_package} systemd(pacakge)"
|
|
559
480
|
else
|
|
560
481
|
output_info "Success stop ${_package} systemd(pacakge)"
|
|
561
482
|
fi
|
|
562
483
|
|
|
563
|
-
${SUDOCMD} systemctl disable ${_package} >/dev/null 2>&1
|
|
564
|
-
if [ $? -ne 0 ]; then
|
|
484
|
+
if ! "${SUDOCMD}" systemctl disable "${_package}" >/dev/null 2>&1; then
|
|
565
485
|
output_warn "Could not disable ${_package} systemd(pacakge)"
|
|
566
486
|
else
|
|
567
487
|
output_info "Success disable ${_package} systemd(pacakge)"
|
|
@@ -583,15 +503,13 @@ register_host()
|
|
|
583
503
|
# $2: url(toward role)
|
|
584
504
|
# $3: role name(for only using message)
|
|
585
505
|
#
|
|
586
|
-
_REGISTER_RESULT
|
|
587
|
-
if [ $? -ne 0 ]; then
|
|
506
|
+
if ! _REGISTER_RESULT=$(curl -s -S -X PUT -H "$1" "$2" 2>&1); then
|
|
588
507
|
exit_err "Could not register to role member with curl error(${_REGISTER_RESULT})"
|
|
589
508
|
fi
|
|
590
509
|
# Check response(expect -> "result": true)
|
|
591
|
-
echo ${_REGISTER_RESULT} | tr '[:lower:]' '[:upper:]' | grep '["]*RESULT["]*:[[:space:]]*TRUE[[:space:]]*,'
|
|
592
|
-
if [ $? -ne 0 ]; then
|
|
510
|
+
if ! echo "${_REGISTER_RESULT}" | tr '[:lower:]' '[:upper:]' | grep -q '["]*RESULT["]*:[[:space:]]*TRUE[[:space:]]*,'; then
|
|
593
511
|
# Get error message(expect -> "message": "...")
|
|
594
|
-
_REGISTER_RESULT_MSG
|
|
512
|
+
_REGISTER_RESULT_MSG=$(echo "${_REGISTER_RESULT}" | sed -e 's/^.*["]*[mM][eE][sS][sS][aA][gG][eE]["]*:[[:space:]]*//g' -e 's/["],.*$//g' -e 's/}.*//g' -e 's/"//g')
|
|
595
513
|
exit_err "Failed to put access for registering by ${_REGISTER_RESULT_MSG}"
|
|
596
514
|
fi
|
|
597
515
|
output_info "Success setting this host to k2hr3 role($3)"
|
|
@@ -607,8 +525,10 @@ delete_host()
|
|
|
607
525
|
# $1: url(toward role)
|
|
608
526
|
# $2: role name(for only using message)
|
|
609
527
|
#
|
|
610
|
-
_DELETE_RESULT
|
|
611
|
-
|
|
528
|
+
if ! _DELETE_RESULT=$(curl -s -S -X DELETE -o /dev/null -w "%{http_code}\n" "$1" 2>&1); then
|
|
529
|
+
exit_err "Could not delete(unregister) host from role member with curl error"
|
|
530
|
+
fi
|
|
531
|
+
if [ -z "${_DELETE_RESULT}" ] || [ "${_DELETE_RESULT}" != "204" ]; then
|
|
612
532
|
exit_err "Could not delete(unregister) host from role member with curl error(${_DELETE_RESULT})"
|
|
613
533
|
fi
|
|
614
534
|
output_info "Success deleting(unregister) this host from k2hr3 role($2)"
|
|
@@ -621,37 +541,36 @@ delete_host()
|
|
|
621
541
|
#
|
|
622
542
|
# Set program name and log file
|
|
623
543
|
#
|
|
624
|
-
SCRIPTDIR
|
|
625
|
-
SCRIPTDIR
|
|
626
|
-
|
|
627
|
-
if
|
|
544
|
+
SCRIPTDIR=$(dirname "${0}")
|
|
545
|
+
SCRIPTDIR=$(cd "${SCRIPTDIR}" || exit 1; pwd)
|
|
546
|
+
|
|
547
|
+
if echo "${SCRIPTDIR}" | grep -q '^/var/lib/cloud'; then
|
|
628
548
|
SCRIPTNAME="k2hr3-init"
|
|
629
|
-
LOGFILE="/var/log/${SCRIPTNAME}.log"
|
|
630
549
|
else
|
|
631
|
-
SCRIPTNAME
|
|
632
|
-
LOGFILE="/var/log/${SCRIPTNAME}.log"
|
|
550
|
+
SCRIPTNAME=$(basename "${0}")
|
|
633
551
|
fi
|
|
552
|
+
LOGFILE="/var/log/${SCRIPTNAME}.log"
|
|
634
553
|
|
|
635
554
|
#
|
|
636
555
|
# Set script mode
|
|
637
556
|
#
|
|
638
557
|
SCRIPTMODE=
|
|
639
558
|
while [ $# -ne 0 ]; do
|
|
640
|
-
if [ "
|
|
559
|
+
if [ -z "$1" ]; then
|
|
641
560
|
break;
|
|
642
561
|
|
|
643
|
-
elif [ "
|
|
644
|
-
func_usage ${SCRIPTNAME}
|
|
562
|
+
elif [ "$1" = "-h" ] || [ "$1" = "-H" ] || [ "$1" = "--HELP" ] || [ "$1" = "--help" ]; then
|
|
563
|
+
func_usage "${SCRIPTNAME}"
|
|
645
564
|
exit 0
|
|
646
565
|
|
|
647
|
-
elif [ "
|
|
648
|
-
if [ "
|
|
566
|
+
elif [ "$1" = "-r" ] || [ "$1" = "-R" ] || [ "$1" = "--register" ] || [ "$1" = "--REGISTER" ]; then
|
|
567
|
+
if [ -n "${SCRIPTMODE}" ]; then
|
|
649
568
|
exit_err "Already set script mode(${SCRIPTMODE}), thus option($1) is not wrong."
|
|
650
569
|
fi
|
|
651
570
|
SCRIPTMODE="r"
|
|
652
571
|
|
|
653
|
-
elif [ "
|
|
654
|
-
if [ "
|
|
572
|
+
elif [ "$1" = "-d" ] || [ "$1" = "-D" ] || [ "$1" = "--delete" ] || [ "$1" = "--DELETE" ]; then
|
|
573
|
+
if [ -n "${SCRIPTMODE}" ]; then
|
|
655
574
|
exit_err "Already set script mode(${SCRIPTMODE}), thus option($1) is not wrong."
|
|
656
575
|
fi
|
|
657
576
|
SCRIPTMODE="d"
|
|
@@ -661,7 +580,7 @@ while [ $# -ne 0 ]; do
|
|
|
661
580
|
fi
|
|
662
581
|
shift
|
|
663
582
|
done
|
|
664
|
-
if [ "
|
|
583
|
+
if [ -z "${SCRIPTMODE}" ]; then
|
|
665
584
|
# Set default values
|
|
666
585
|
SCRIPTMODE="r"
|
|
667
586
|
fi
|
|
@@ -717,11 +636,12 @@ INSTANCE_ID_FILE="${CLOUDINIT_DATA_DIR}/instance-id"
|
|
|
717
636
|
#
|
|
718
637
|
K2HR3_ROLE_TOKEN="{{= %K2HR3_ROLE_TOKEN% }}"
|
|
719
638
|
K2HR3_ROLE_NAME="{{= %K2HR3_ROLE_NAME% }}"
|
|
720
|
-
K2HR3_RESOURCE_NAME
|
|
639
|
+
K2HR3_RESOURCE_NAME=$(echo "${K2HR3_ROLE_NAME}" | sed -e 's/:[rR][oO][lL][eE]:/:resource:/g')
|
|
721
640
|
K2HR3_ROLE_TENANT="{{= %K2HR3_ROLE_TENANT% }}"
|
|
722
641
|
K2HR3_API_HOST_URI="{{= %K2HR3_API_HOST_URI% }}"
|
|
723
642
|
K2HR3_ERROR_MSG="{{= %K2HR3_ERROR_MSG% }}"
|
|
724
|
-
|
|
643
|
+
|
|
644
|
+
if [ -n "${K2HR3_ERROR_MSG}" ] && [ "${K2HR3_ERROR_MSG}" != "null" ]; then
|
|
725
645
|
exit_err "The script template has failed(${K2HR3_ERROR_MSG}) to be expanded and cannot be executed anymore."
|
|
726
646
|
fi
|
|
727
647
|
|
|
@@ -740,7 +660,7 @@ check_curl
|
|
|
740
660
|
#
|
|
741
661
|
# Processing by mode
|
|
742
662
|
#
|
|
743
|
-
if [ "
|
|
663
|
+
if [ "${SCRIPTMODE}" = "r" ]; then
|
|
744
664
|
#
|
|
745
665
|
# Register and Install packages and Start services
|
|
746
666
|
#
|
|
@@ -755,13 +675,11 @@ if [ "X${SCRIPTMODE}" = "Xr" ]; then
|
|
|
755
675
|
#
|
|
756
676
|
# Cehck output directory
|
|
757
677
|
#
|
|
758
|
-
if [ ! -d ${K2HR3_ETC_DIR} ]; then
|
|
759
|
-
${SUDOCMD} mkdir -p ${K2HR3_ETC_DIR}
|
|
760
|
-
if [ $? -ne 0 ]; then
|
|
678
|
+
if [ ! -d "${K2HR3_ETC_DIR}" ]; then
|
|
679
|
+
if ! "${SUDOCMD}" mkdir -p "${K2HR3_ETC_DIR}"; then
|
|
761
680
|
exit_err "Could not make directory ${K2HR3_ETC_DIR}"
|
|
762
681
|
fi
|
|
763
|
-
${SUDOCMD} chmod 0777 ${K2HR3_ETC_DIR}
|
|
764
|
-
if [ $? -ne 0 ]; then
|
|
682
|
+
if ! "${SUDOCMD}" chmod 0777 "${K2HR3_ETC_DIR}"; then
|
|
765
683
|
output_warn "Could not change permission ${K2HR3_ETC_DIR}"
|
|
766
684
|
fi
|
|
767
685
|
fi
|
|
@@ -769,21 +687,22 @@ if [ "X${SCRIPTMODE}" = "Xr" ]; then
|
|
|
769
687
|
#
|
|
770
688
|
# Generate values
|
|
771
689
|
#
|
|
772
|
-
if [ ! -f ${INSTANCE_ID_FILE} ]; then
|
|
690
|
+
if [ ! -f "${INSTANCE_ID_FILE}" ]; then
|
|
773
691
|
exit_err "Could not read ${INSTANCE_ID_FILE}"
|
|
774
692
|
fi
|
|
775
|
-
|
|
776
|
-
|
|
693
|
+
if ! INSTANCE_ID=$(tr -d '\n' < "${INSTANCE_ID_FILE}" 2>/dev/null); then
|
|
694
|
+
exit_err "Unknown Instance Id in ${INSTANCE_ID_FILE}"
|
|
695
|
+
fi
|
|
696
|
+
if [ -z "${INSTANCE_ID}" ]; then
|
|
777
697
|
exit_err "Unknown Instance Id in ${INSTANCE_ID_FILE}"
|
|
778
698
|
fi
|
|
779
699
|
CUK_VALUE="${INSTANCE_ID}"
|
|
780
700
|
CUK_PARAMETER="cuk=${INSTANCE_ID}"
|
|
781
701
|
EXTRA_PARAMETER="extra=openstack-auto-v1"
|
|
782
|
-
LOCAL_HOSTNAME
|
|
783
|
-
if
|
|
702
|
+
TAG_PARAMETER="tag=${LOCAL_HOSTNAME}"
|
|
703
|
+
if ! LOCAL_HOSTNAME=$(hostname); then
|
|
784
704
|
output_warn "Local hostname is empty"
|
|
785
705
|
fi
|
|
786
|
-
TAG_PARAMETER="tag=${LOCAL_HOSTNAME}"
|
|
787
706
|
|
|
788
707
|
#
|
|
789
708
|
# Register this host to K2HR3
|
|
@@ -833,12 +752,13 @@ else
|
|
|
833
752
|
# Load parameters( the value used when registering has priority )
|
|
834
753
|
#
|
|
835
754
|
output_info "Loading values from files under ${K2HR3_ETC_DIR} directory"
|
|
836
|
-
|
|
837
|
-
|
|
838
|
-
|
|
839
|
-
|
|
840
|
-
|
|
841
|
-
|
|
755
|
+
# shellcheck disable=SC2034
|
|
756
|
+
LOAD_K2HR3_ROLE_TOKEN=$(load_value_with_default "${K2HR3_ROLE_TOKEN_FILE}" "${K2HR3_ROLE_TOKEN}")
|
|
757
|
+
LOAD_K2HR3_ROLE_NAME=$(load_value_with_default "${K2HR3_ROLE_NAME_FILE}" "${K2HR3_ROLE_NAME}")
|
|
758
|
+
LOAD_CUK_PARAMETER=$(load_value_with_default "${K2HR3_CUK_PARAM_FILE}" "${CUK_PARAMETER}")
|
|
759
|
+
LOAD_EXTRA_PARAMETER=$(load_value_with_default "${K2HR3_EXTRA_PARAM_FILE}" "${EXTRA_PARAMETER}")
|
|
760
|
+
LOAD_TAG_PARAMETER=$(load_value_with_default "${K2HR3_TAG_PARAM_FILE}" "${TAG_PARAMETER}")
|
|
761
|
+
LOAD_K2HR3_API_HOST_URI=$(load_value_with_default "${K2HR3_API_HOST_URI_FILE}" "${K2HR3_API_HOST_URI}")
|
|
842
762
|
|
|
843
763
|
#
|
|
844
764
|
# API URI
|
|
@@ -862,15 +782,15 @@ else
|
|
|
862
782
|
# Remove files
|
|
863
783
|
#
|
|
864
784
|
output_info "Remove files under ${K2HR3_ETC_DIR} directory"
|
|
865
|
-
${SUDOCMD} rm -f ${K2HR3_ROLE_TOKEN_FILE}
|
|
866
|
-
${SUDOCMD} rm -f ${K2HR3_ROLE_NAME_FILE}
|
|
867
|
-
${SUDOCMD} rm -f ${K2HR3_ROLE_TENANT_FILE}
|
|
868
|
-
${SUDOCMD} rm -f ${K2HR3_CUK_VALUE_FILE}
|
|
869
|
-
${SUDOCMD} rm -f ${K2HR3_CUK_PARAM_FILE}
|
|
870
|
-
${SUDOCMD} rm -f ${K2HR3_EXTRA_PARAM_FILE}
|
|
871
|
-
${SUDOCMD} rm -f ${K2HR3_TAG_PARAM_FILE}
|
|
872
|
-
${SUDOCMD} rm -f ${K2HR3_API_ARG_FILE}
|
|
873
|
-
${SUDOCMD} rm -f ${K2HR3_API_HOST_URI_FILE}
|
|
785
|
+
"${SUDOCMD}" rm -f "${K2HR3_ROLE_TOKEN_FILE}"
|
|
786
|
+
"${SUDOCMD}" rm -f "${K2HR3_ROLE_NAME_FILE}"
|
|
787
|
+
"${SUDOCMD}" rm -f "${K2HR3_ROLE_TENANT_FILE}"
|
|
788
|
+
"${SUDOCMD}" rm -f "${K2HR3_CUK_VALUE_FILE}"
|
|
789
|
+
"${SUDOCMD}" rm -f "${K2HR3_CUK_PARAM_FILE}"
|
|
790
|
+
"${SUDOCMD}" rm -f "${K2HR3_EXTRA_PARAM_FILE}"
|
|
791
|
+
"${SUDOCMD}" rm -f "${K2HR3_TAG_PARAM_FILE}"
|
|
792
|
+
"${SUDOCMD}" rm -f "${K2HR3_API_ARG_FILE}"
|
|
793
|
+
"${SUDOCMD}" rm -f "${K2HR3_API_HOST_URI_FILE}"
|
|
874
794
|
|
|
875
795
|
#
|
|
876
796
|
# Finish
|