Minor fixes as follow-up for new Pegleg
Change-Id: Ice3d03f5cf890cca55f191bbb3f6252fc2901997
This commit is contained in:
parent
e99d69eb9e
commit
7cf604036f
|
@ -140,7 +140,7 @@ collect_ssh_key() {
|
||||||
ssh_keypair_declare
|
ssh_keypair_declare
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${USE_EXISTING_SECRETS}" ]]; then
|
if [[ -n "${USE_EXISTING_SECRETS}" ]]; then
|
||||||
log "Using existing manifests for secrets"
|
log "Using existing manifests for secrets"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -324,9 +324,9 @@ install_libvirt_key() {
|
||||||
sudo chmod 700 ~virtmgr/.ssh
|
sudo chmod 700 ~virtmgr/.ssh
|
||||||
sudo chmod 600 ~virtmgr/.ssh/authorized_keys
|
sudo chmod 600 ~virtmgr/.ssh/authorized_keys
|
||||||
|
|
||||||
if [[ "${USE_EXISTING_SECRETS}" ]]; then
|
if [[ -n "${USE_EXISTING_SECRETS}" ]]; then
|
||||||
log "Using existing manifests for secrets"
|
log "Using existing manifests for secrets"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "${GATE_DEPOT}"
|
mkdir -p "${GATE_DEPOT}"
|
||||||
|
|
|
@ -19,7 +19,7 @@ done
|
||||||
|
|
||||||
CERTS_PATH="/certs/*.yaml"
|
CERTS_PATH="/certs/*.yaml"
|
||||||
KEYS_PATH="/gate/*.yaml"
|
KEYS_PATH="/gate/*.yaml"
|
||||||
if [[ "${USE_EXISTING_SECRETS}" ]]
|
if [[ -n "${USE_EXISTING_SECRETS}" ]]
|
||||||
then
|
then
|
||||||
CERTS_PATH=""
|
CERTS_PATH=""
|
||||||
KEYS_PATH=""
|
KEYS_PATH=""
|
||||||
|
|
|
@ -30,7 +30,7 @@ GATE_FILES=($(find "${GATE_DEPOT}" -name '*.yaml' | xargs -n 1 basename | xargs
|
||||||
mkdir -p "${CERT_DEPOT}"
|
mkdir -p "${CERT_DEPOT}"
|
||||||
chmod 777 "${CERT_DEPOT}"
|
chmod 777 "${CERT_DEPOT}"
|
||||||
|
|
||||||
if [[ "${USE_EXISTING_SECRETS}" ]]
|
if [[ -n "${USE_EXISTING_SECRETS}" ]]
|
||||||
then
|
then
|
||||||
log Certificates already provided by manifests
|
log Certificates already provided by manifests
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
@ -60,7 +60,7 @@ sleep 120
|
||||||
check_configdocs_result "$(shipyard_cmd create configdocs design --directory=${BUILD_WORK_DIR}/site --replace)"
|
check_configdocs_result "$(shipyard_cmd create configdocs design --directory=${BUILD_WORK_DIR}/site --replace)"
|
||||||
|
|
||||||
# Skip certs/gate if already part of site manifests
|
# Skip certs/gate if already part of site manifests
|
||||||
if [[ "${USE_EXISTING_SECRETS}" ]]
|
if [[ -n "${USE_EXISTING_SECRETS}" ]]
|
||||||
then
|
then
|
||||||
OMIT_CERTS=1
|
OMIT_CERTS=1
|
||||||
OMIT_GATE=1
|
OMIT_GATE=1
|
||||||
|
|
Loading…
Reference in New Issue