diff options
| author |   James Gu <james.gu@att.com> | 2020-11-30 22:01:25 -0800 |
|---|---|---|
| committer | James Gu <james.gu@att.com> | 2020-12-02 23:20:44 +0000 |
| commit | fc2050ad1681071d03adfdbfcf2a2f638c8a4712 (patch) | |
| tree | 0a5a5c64aaa09ef00849815e9ad1d913c5195361 | |
| parent | 56d2b8c4045a62a95db616247779b23c472f5b50 (diff) | |
Remove unused router l3-agent extensions and adjust keystone rgw
accepted roles for functest
Also added retry login when first time invoke shipyard action in
the deploy script. Occasionally, genesis finishes without the ucp
service apis are fully up and accept requests.
Signed-off-by: James Gu <james.gu@att.com>
Change-Id: Id57ef02f3d2601033a6bf42c91b74668bdf10db3
| -rw-r--r-- | site/intel-pod15/site-definition.yaml | 2 | ||||
| -rw-r--r-- | site/intel-pod17/site-definition.yaml | 2 | ||||
| -rwxr-xr-x | tools/deploy.sh | 16 |
3 files changed, 15 insertions, 5 deletions
diff --git a/site/intel-pod15/site-definition.yaml b/site/intel-pod15/site-definition.yaml index 1cfe8e6..79a4a0c 100644 --- a/site/intel-pod15/site-definition.yaml +++ b/site/intel-pod15/site-definition.yaml @@ -12,6 +12,6 @@ data: repositories: global: - revision: a757b06879380931e4c9e2b54671dcbeb2c16d08 + revision: refs/changes/26/764826/6 url: https://opendev.org/airship/treasuremap.git ... diff --git a/site/intel-pod17/site-definition.yaml b/site/intel-pod17/site-definition.yaml index ab08724..f087c1f 100644 --- a/site/intel-pod17/site-definition.yaml +++ b/site/intel-pod17/site-definition.yaml @@ -12,6 +12,6 @@ data: repositories: global: - revision: a757b06879380931e4c9e2b54671dcbeb2c16d08 + revision: refs/changes/26/764826/6 url: https://opendev.org/airship/treasuremap.git ... diff --git a/tools/deploy.sh b/tools/deploy.sh index d1be5d6..be9669c 100755 --- a/tools/deploy.sh +++ b/tools/deploy.sh @@ -205,13 +205,23 @@ genesis_deploy() { ssh $GEN_SSH PROMENADE_ENCRYPTION_KEY=$PROMENADE_KEY sudo -E ./genesis.sh } -site_action() { +create_configdocs() { + sudo -E ${AIRSHIP_CMD} shipyard create configdocs \ + $SITE_NAME --directory=/target/collect/$SITE_NAME --replace +} +site_action() { # Site deployment with Shipyard, see more details here # https://airship-treasuremap.readthedocs.io/en/latest/authoring_and_deployment.html#deploy-site-with-shipyard - sudo -E ${AIRSHIP_CMD} shipyard create configdocs \ - $SITE_NAME --directory=/target/collect/$SITE_NAME --replace + # retry in case the ucp apis are not ready to serve yet + retries=0 + while ! create_configdocs && [ $retries -lt 20 ]; do + retries=$((retries+1)) + echo "Create configdocs failed. Retrying # $retries out of 20 in 15 seconds" + sleep 15 + done + sudo -E ${AIRSHIP_CMD} shipyard commit configdocs sudo -E ${AIRSHIP_CMD} shipyard create action \ |