Browse Source

Merge "Parametrize timeout parameter for shipyard action"

changes/92/713992/1
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
ad9a234dd9
3 changed files with 4 additions and 2 deletions
  1. +2
    -0
      tools/deployment/seaworthy-virt/airship_gate/lib/config.sh
  2. +1
    -1
      tools/deployment/seaworthy-virt/airship_gate/stages/shipyard-deploy-site.sh
  3. +1
    -1
      tools/deployment/seaworthy-virt/airship_gate/stages/shipyard-update-site.sh

+ 2
- 0
tools/deployment/seaworthy-virt/airship_gate/lib/config.sh View File

@@ -29,6 +29,8 @@ export NTP_SERVERS=${NTP_SERVERS:-""}
export PROMENADE_ENCRYPTION_KEY=${PROMENADE_ENCRYPTION_KEY:-MjI1N2ZiMjMzYjI0ZmVkZDU4}
export PEGLEG_PASSPHRASE=${PEGLEG_PASSPHRASE:-ewd?egnPWL0Q?hzzGwEBmII5}
export PEGLEG_SALT=${PEGLEG_SALT:-9EX&uapdz1ka17WOQMG-FjTA}
export SHIPYARD_DEPLOY_TIMEOUT=${SHIPYARD_DEPLOY_TIMEOUT:-"7600"}
export SHIPYARD_UPDATE_TIMEOUT=${SHIPYARD_UPDATE_TIMEOUT:-"1800"}

# key-pair used for drydock/maas auth towards libvirt and access to
# the virtual nodes; auto-generated if no value provided


+ 1
- 1
tools/deployment/seaworthy-virt/airship_gate/stages/shipyard-deploy-site.sh View File

@@ -19,4 +19,4 @@ source "${GATE_UTILS}"

cd "${TEMP_DIR}"

shipyard_action_wait deploy_site 7200
shipyard_action_wait deploy_site "${SHIPYARD_DEPLOY_TIMEOUT}"

+ 1
- 1
tools/deployment/seaworthy-virt/airship_gate/stages/shipyard-update-site.sh View File

@@ -19,4 +19,4 @@ source "${GATE_UTILS}"

cd "${TEMP_DIR}"

shipyard_action_wait update_site 1800
shipyard_action_wait update_site "${SHIPYARD_UPDATE_TIMEOUT}"

Loading…
Cancel
Save