TT#139455 don't chown configs if NGCP_TESTSUITE is set

* create chown_config function and remove duplicate code

Change-Id: I4996c1931cb53ec8120fa715ab0067b71ab8d5a8
mr10.2
ngcp-config 3 years ago committed by Marco Capetta
parent 4eb88af1f0
commit f7d9d812a4

@ -149,6 +149,29 @@ get_branch_status() {
fi fi
} }
chown_configs() {
if [ "${NGCP_TESTSUITE:-false}" = "true" ]; then
log_debug "chown_configs: NGCP_TESTSUITE is set, skip step"
return
fi
for f in ${NGCPCTL_CONFIG:-} ${HA_CONFIG:-} ${PAIR_CONFIG:-} ${HOST_CONFIG:-} ${LOCAL_CONFIG:-} "${EXTRA_CONFIG_FILES[@]}" ; do
if [ ! -f "${f}" ]; then
continue
fi
chown "${CONFIG_USER}":"${CONFIG_GROUP}" "${f}"
chmod "${CONFIG_CHMOD}" "${f}"
done
if [ -f "${NETWORK_CONFIG:-}" ]; then
chown "${NETWORK_CONFIG_USER}":"${NETWORK_CONFIG_GROUP}" "${NETWORK_CONFIG}"
chmod "${NETWORK_CONFIG_CHMOD}" "${NETWORK_CONFIG}"
fi
if [ -f "${CONSTANTS_CONFIG:-}" ]; then
chown "${CONSTANTS_CONFIG_USER}":"${CONSTANTS_CONFIG_GROUP}" "${CONSTANTS_CONFIG}"
chmod "${CONSTANTS_CONFIG_CHMOD}" "${CONSTANTS_CONFIG}"
fi
}
record_commit_id() { record_commit_id() {
log_debug "cd ${NGCPCTL_MAIN}" log_debug "cd ${NGCPCTL_MAIN}"
cd "${NGCPCTL_MAIN}" || return cd "${NGCPCTL_MAIN}" || return

@ -138,21 +138,7 @@ else
fi fi
# Apply configured file ownership and permissions # Apply configured file ownership and permissions
for f in ${NGCPCTL_CONFIG:-} ${HA_CONFIG:-} ${PAIR_CONFIG:-} ${HOST_CONFIG:-} ${LOCAL_CONFIG:-} "${EXTRA_CONFIG_FILES[@]}" ; do chown_configs
if [ ! -f "${f}" ]; then
continue
fi
chown "${CONFIG_USER}":"${CONFIG_GROUP}" "${f}"
chmod "${CONFIG_CHMOD}" "${f}"
done
if [ -f "${NETWORK_CONFIG:-}" ]; then
chown "${NETWORK_CONFIG_USER}":"${NETWORK_CONFIG_GROUP}" "${NETWORK_CONFIG}"
chmod "${NETWORK_CONFIG_CHMOD}" "${NETWORK_CONFIG}"
fi
if [ -f "${CONSTANTS_CONFIG:-}" ]; then
chown "${CONSTANTS_CONFIG_USER}":"${CONSTANTS_CONFIG_GROUP}" "${CONSTANTS_CONFIG}"
chmod "${CONSTANTS_CONFIG_CHMOD}" "${CONSTANTS_CONFIG}"
fi
exit 0 exit 0

@ -32,21 +32,7 @@ if [ -x "${NGCPCTL_MAIN}/.git/hooks/pre-commit" ] ; then
fi fi
# Apply configured file ownership and permissions # Apply configured file ownership and permissions
for f in ${NGCPCTL_CONFIG:-} ${HA_CONFIG:-} ${PAIR_CONFIG:-} ${HOST_CONFIG:-} ${LOCAL_CONFIG:-} "${EXTRA_CONFIG_FILES[@]}" ; do chown_configs
if [ ! -f "${f}" ]; then
continue
fi
chown "${CONFIG_USER}":"${CONFIG_GROUP}" "${f}"
chmod "${CONFIG_CHMOD}" "${f}"
done
if [ -f "${NETWORK_CONFIG:-}" ]; then
chown "${NETWORK_CONFIG_USER}":"${NETWORK_CONFIG_GROUP}" "${NETWORK_CONFIG}"
chmod "${NETWORK_CONFIG_CHMOD}" "${NETWORK_CONFIG}"
fi
if [ -f "${CONSTANTS_CONFIG:-}" ]; then
chown "${CONSTANTS_CONFIG_USER}":"${CONSTANTS_CONFIG_GROUP}" "${CONSTANTS_CONFIG}"
chmod "${CONSTANTS_CONFIG_CHMOD}" "${CONSTANTS_CONFIG}"
fi
cd "$NGCPCTL_MAIN" cd "$NGCPCTL_MAIN"

Loading…
Cancel
Save