diff options
| author |   James Gu <james.gu@att.com> | 2021-03-02 12:30:11 -0800 |
|---|---|---|
| committer | James Gu <james.gu@att.com> | 2021-03-02 20:50:50 +0000 |
| commit | 286cb850aad6fb73aa1debbc8e7fd54560682b2f (patch) | |
| tree | 0a258318a99f40530be4e974731552c0f8d4a7ea /site/intel-pod15/site-definition.yaml | |
| parent | b6153c6e800463f7682cfbc3218328a93f79c7c7 (diff) | |
Intel-pod 15 upgrade to Airship 1.8stable/jerma
Fixed the last issue in pod 15 site upgrade to airship 1.8.
Added sleep between genesis and shipyard site action
Updated upstream treasumerap reference to include the QOS fix
Change-Id: I0086778eb8bb1ba1222880c4d0dfca829c82a9ca
Signed-off-by: James Gu <james.gu@att.com>
(cherry picked from commit 88723e1bb827b0efa57f47cb12d0ff1c1fe7802c)
Diffstat (limited to 'site/intel-pod15/site-definition.yaml')
| -rw-r--r-- | site/intel-pod15/site-definition.yaml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/site/intel-pod15/site-definition.yaml b/site/intel-pod15/site-definition.yaml index e3cc37e..81f8b17 100644 --- a/site/intel-pod15/site-definition.yaml +++ b/site/intel-pod15/site-definition.yaml @@ -12,10 +12,6 @@ data: repositories: global: -<<<<<<< HEAD (ea42d6 Catch NeutronNetworks.create_and_*routers in blacklist) - revision: v1.8 -======= - revision: 94f354467b7bbe1cd464b7803b3369296ca55e35 ->>>>>>> CHANGE (c79c2e Update treasuremap version to include upstream rbac fixes) + revision: 40c743f7fa715c3c9dc3e3cc4ee21cf6553f2ebb url: https://opendev.org/airship/treasuremap.git ... |