Merge "Support configurable Zaqar backends"

diff --combined tools/yaml-validate.py
index 438f196,d35cba6..33d12ee
--- 1/tools/yaml-validate.py
--- 2/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@@ -49,93 -49,8 +49,93 @@@ PARAMETER_DEFINITION_EXCLUSIONS = {'Man
                                     'ExternalAllocationPools': ['default'],
                                     'StorageNetCidr': ['default'],
                                     'StorageAllocationPools': ['default'],
 -                                   'StorageMgmtNetCidr': ['default'],
 +                                   'StorageMgmtNetCidr': ['default',
 +                                                          # FIXME
 +                                                          'description'],
                                     'StorageMgmtAllocationPools': ['default'],
 +                                   'TenantNetCidr': ['default'],
 +                                   'TenantAllocationPools': ['default'],
 +                                   'InternalApiNetCidr': ['default'],
 +                                   'UpdateIdentifier': ['description'],
 +                                   # TODO(bnemec): Address these existing
 +                                   # inconsistencies.
 +                                   'NeutronMetadataProxySharedSecret': [
 +                                       'description', 'hidden'],
 +                                   'ServiceNetMap': ['description', 'default'],
 +                                   'RedisPassword': ['description'],
 +                                   'EC2MetadataIp': ['default'],
 +                                   'network': ['default'],
 +                                   'ControlPlaneIP': ['default',
 +                                                      'description'],
 +                                   'ControlPlaneIp': ['default',
 +                                                      'description'],
 +                                   'NeutronBigswitchLLDPEnabled': ['default'],
 +                                   'NeutronEnableL2Pop': ['description'],
 +                                   'NeutronWorkers': ['description'],
 +                                   'TenantIpSubnet': ['description'],
 +                                   'ExternalNetName': ['description'],
 +                                   'AdminToken': ['description'],
 +                                   'ControlPlaneDefaultRoute': ['default'],
 +                                   'StorageMgmtNetName': ['description'],
 +                                   'ServerMetadata': ['description'],
 +                                   'InternalApiIpUri': ['description'],
 +                                   'UpgradeLevelNovaCompute': ['default'],
 +                                   'StorageMgmtIpUri': ['description'],
 +                                   'server': ['description'],
 +                                   'servers': ['description'],
 +                                   'FixedIPs': ['description'],
 +                                   'ExternalIpSubnet': ['description'],
 +                                   'NeutronBridgeMappings': ['description'],
 +                                   'ExtraConfig': ['description'],
 +                                   'InternalApiIpSubnet': ['description'],
 +                                   'DefaultPasswords': ['description',
 +                                                        'default'],
 +                                   'BondInterfaceOvsOptions': ['description',
 +                                                               'default',
 +                                                               'constraints'],
 +                                   'KeyName': ['constraints'],
 +                                   'TenantNetName': ['description'],
 +                                   'StorageIpSubnet': ['description'],
 +                                   'OVNSouthboundServerPort': ['description'],
 +                                   'ExternalInterfaceDefaultRoute':
 +                                       ['description', 'default'],
 +                                   'ExternalIpUri': ['description'],
 +                                   'IPPool': ['description'],
 +                                   'ControlPlaneNetwork': ['description'],
 +                                   'SSLCertificate': ['description',
 +                                                      'default',
 +                                                      'hidden'],
 +                                   'HostCpusList': ['default', 'constraints'],
 +                                   'InternalApiAllocationPools': ['default'],
 +                                   'NodeIndex': ['description'],
 +                                   'SwiftPassword': ['description'],
 +                                   'name': ['description', 'default'],
 +                                   'StorageNetName': ['description'],
 +                                   'ManagementNetName': ['description'],
 +                                   'NeutronPublicInterface': ['description'],
 +                                   'RoleParameters': ['description'],
 +                                   'AdminPassword': ['description', 'hidden'],
 +                                   'ManagementInterfaceDefaultRoute':
 +                                       ['default'],
 +                                   'NovaPassword': ['description'],
 +                                   'image': ['description', 'default'],
 +                                   'NeutronBigswitchAgentEnabled': ['default'],
 +                                   'EndpointMap': ['description', 'default'],
 +                                   'DockerManilaConfigImage': ['description',
 +                                                               'default'],
 +                                   'NetworkName': ['default', 'description'],
 +                                   'StorageIpUri': ['description'],
 +                                   'InternalApiNetName': ['description'],
 +                                   'NeutronTunnelTypes': ['description'],
 +                                   'replacement_policy': ['default'],
 +                                   'StorageMgmtIpSubnet': ['description'],
 +                                   'CloudDomain': ['description', 'default'],
 +                                   'key_name': ['default', 'description'],
 +                                   'EnableLoadBalancer': ['description'],
 +                                   'ControllerExtraConfig': ['description'],
 +                                   'NovaComputeExtraConfig': ['description'],
 +                                   'controllerExtraConfig': ['description'],
 +                                   'DockerSwiftConfigImage': ['default'],
                                     }
  
  PREFERRED_CAMEL_CASE = {
@@@ -304,11 -219,13 +304,13 @@@ def validate_docker_service(filename, t
          if 'docker_config' in role_data:
              docker_config = role_data['docker_config']
              for _, step in docker_config.items():
+                 if not isinstance(step, dict):
+                     # NOTE(mandre) this skips everything that is not a dict
+                     # so we may ignore some containers definitions if they
+                     # are in a map_merge for example
+                     continue
                  for _, container in step.items():
                      if not isinstance(container, dict):
-                         # NOTE(mandre) this skips everything that is not a dict
-                         # so we may ignore some containers definitions if they
-                         # are in a map_merge for example
                          continue
                      command = container.get('command', '')
                      if isinstance(command, list):
@@@ -507,8 -424,10 +509,8 @@@ for p, defs in param_map.items()
      # If all items in the list are not == the first, then the check fails
      if check_data.count(check_data[0]) != len(check_data):
          mismatch_count += 1
 -        # TODO(bnemec): Make this a hard failure once all the templates have
 -        #               been fixed.
 -        #exit_val |= 1
 -        #failed_files.extend([d['filename'] for d in defs])
 +        exit_val |= 1
 +        failed_files.extend([d['filename'] for d in defs])
          print('Mismatched parameter definitions found for "%s"' % p)
          print('Definitions found:')
          for d in defs: