Intel-pod 15 upgrade to Airship 1.8

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>

diff --git a/site/intel-pod15/networks/physical/networks.yaml b/site/intel-pod15/networks/physical/networks.yaml
index f93b9bf..c3c6d2f 100644 (file)
--- a/site/intel-pod15/networks/physical/networks.yaml
+++ b/site/intel-pod15/networks/physical/networks.yaml
@@ -86,13 +86,13 @@ data:
     - type: dhcp
       start: 10.10.151.40
       end: 10.10.151.128
-#   dns:
+  dns:
     # NEWSITE-CHANGEME: Use MAAS VIP as the DNS server.
     # MAAS has inbuilt DNS server and Debian mirror that allows nodes to be
     # deployed without requiring routed/internet access for the Admin/PXE interface.
     # See data.vip.maas_vip in networks/common-addresses.yaml.
     # TODO: This should be populated via substitution from common-addresses
-#    servers: '10.10.151.20'
+    servers: '10.10.151.20'
 ...
 ---
 schema: 'drydock/Network/v1'
@@ -252,4 +252,10 @@ data:
       # NEWSITE-CHANGEME: Update to the gateway address for this network
       gateway: 10.10.155.1
       metric: 100
+  labels:
+    # NEWSITE-CHANGEME: All cruisers should have this enabled, set to false if this
+    #     is a special case in corridor 1 that doesn't support a floating IP pool.
+    #     If set to false, IP Addresses and CIDR will still need to be specified
+    #     above to satisfy the schema and substitution used by other documents.
+    enabled: true
 ...

diff --git a/site/intel-pod15/site-definition.yaml b/site/intel-pod15/site-definition.yaml
index 72e22ff..81f8b17 100644 (file)
--- a/site/intel-pod15/site-definition.yaml
+++ b/site/intel-pod15/site-definition.yaml
@@ -12,6 +12,6 @@ data:
 
   repositories:
     global:
-      revision: refs/changes/70/771670/1
+      revision: 40c743f7fa715c3c9dc3e3cc4ee21cf6553f2ebb
       url: https://opendev.org/airship/treasuremap.git
 ...

diff --git a/site/intel-pod17/networks/physical/networks.yaml b/site/intel-pod17/networks/physical/networks.yaml
index a0c5ca6..af0bccc 100644 (file)
--- a/site/intel-pod17/networks/physical/networks.yaml
+++ b/site/intel-pod17/networks/physical/networks.yaml
@@ -86,13 +86,13 @@ data:
     - type: dhcp
       start: 10.10.171.40
       end: 10.10.171.128
-#   dns:
+  dns:
     # NEWSITE-CHANGEME: Use MAAS VIP as the DNS server.
     # MAAS has inbuilt DNS server and Debian mirror that allows nodes to be
     # deployed without requiring routed/internet access for the Admin/PXE interface.
     # See data.vip.maas_vip in networks/common-addresses.yaml.
     # TODO: This should be populated via substitution from common-addresses
-#    servers: '10.10.171.20'
+    servers: '10.10.171.20'
 ...
 ---
 schema: 'drydock/Network/v1'

diff --git a/site/intel-pod17/site-definition.yaml b/site/intel-pod17/site-definition.yaml
index 4d16f71..0780e8e 100644 (file)
--- a/site/intel-pod17/site-definition.yaml
+++ b/site/intel-pod17/site-definition.yaml
@@ -13,6 +13,6 @@ data:
   repositories:
     global:
       # qos fix
-      revision: refs/changes/70/771670/1
+      revision: 40c743f7fa715c3c9dc3e3cc4ee21cf6553f2ebb
       url: https://opendev.org/airship/treasuremap.git
 ...

diff --git a/tools/deploy.sh b/tools/deploy.sh
index 1fa2e80..e8943ac 100755 (executable)
--- a/tools/deploy.sh
+++ b/tools/deploy.sh
@@ -203,6 +203,8 @@ promenade_bundle() {
 genesis_deploy() {
   scp bundle/${SITE_NAME}/genesis.sh $GEN_SSH:
   ssh $GEN_SSH PROMENADE_ENCRYPTION_KEY=$PROMENADE_KEY sudo -E ./genesis.sh
+  # give some time for shipyard service to be ready to avoid error out during site actions
+  sleep 60
 }
 
 create_configdocs() {