Merge "Add missing update_serial key to compute roles" into stable/queens

roles/ComputeHCIOvsDpdk.yaml

@@ -12,6 +12,8 @@
   HostnameFormatDefault: '%stackname%-computehciovsdpdk-%index%'
   disable_upgrade_deployment: True
   deprecated_nic_config_name: 'compute-dpdk.yaml'
+  # CephOSD present so serial has to be 1
+  update_serial: 1
   RoleParametersDefault:
     TunedProfileName: "cpu-partitioning"
     VhostuserSocketGroup: "hugetlbfs"

roles/ComputeLocalEphemeral.yaml

@@ -9,6 +9,7 @@
     - InternalApi
     - Tenant
     - Storage
+  update_serial: 25
   HostnameFormatDefault: '%stackname%-novacompute-local-%index%'
   RoleParametersDefault:
     TunedProfileName: "virtual-host"

roles/ComputeRBDEphemeral.yaml

@@ -9,6 +9,7 @@
     - InternalApi
     - Tenant
     - Storage
+  update_serial: 25
   HostnameFormatDefault: '%stackname%-novacompute-rbd-%index%'
   RoleParametersDefault:
     TunedProfileName: "virtual-host"

tools/yaml-validate.py

@@ -365,8 +365,27 @@ def validate_with_compute_role_services(role_filename, role_tpl, exclude_service
               'ServicesDefault in roles/Compute.yaml'.format(role_filename,
               ', '.join(missing_services)))
         return 1
-    return 0
 
+    cmpt_us = cmpt_tpl[0].get('update_serial', None)
+    tpl_us = role_tpl[0].get('update_serial', None)
+
+    if 'OS::TripleO::Services::CephOSD' in role_services:
+        if tpl_us not in (None, 1):
+            print('ERROR: update_serial in {0} ({1}) '
+                  'is should be 1 as it includes CephOSD'.format(
+                      role_filename,
+                      tpl_us,
+                      cmpt_us))
+            return 1
+    elif cmpt_us is not None and tpl_us != cmpt_us:
+        print('ERROR: update_serial in {0} ({1}) '
+              'does not match roles/Compute.yaml {2}'.format(
+                  role_filename,
+                  tpl_us,
+                  cmpt_us))
+        return 1
+
+    return 0
 
 def search(item, check_item, check_key):
     if check_item(item):