Remove duplicate docker/puppet services.yaml

Move to one common services.yaml not only reduces the duplication, but it
should improve performance for the docker/services.yaml case, because we were
creating two ResourceChains with $many services which we know can be really
slow (especially since we seem to be missing concurrent: true on one)

Change-Id: I76f188438bfc6449b152c2861d99738e6eb3c61b

1 files changed, 0 insertions, 129 deletions

diff --git a/puppet/services/services.yaml b/puppet/services/services.yaml
deleted file mode 100644
index 0e7b6d2b..00000000
--- a/puppet/services/services.yaml
+++ /dev/null
@@ -1,129 +0,0 @@
-heat_template_version: pike
-
-description: >
-  Utility stack to convert an array of services into a set of combined
-  role configs.
-
-parameters:
-  Services:
-    default: []
-    description: |
-        List nested stack service templates.
-    type: comma_delimited_list
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  DefaultPasswords:
-    default: {}
-    description: Mapping of service -> default password. Used to help
-                 pass top level passwords managed by Heat into services.
-    type: json
-  RoleName:
-    default: ''
-    description: Role name on which the service is applied
-    type: string
-  RoleParameters:
-    description: Role Specific parameters to be provided to service
-    default: {}
-    type: json
-
-resources:
-
-  ServiceChain:
-    type: OS::Heat::ResourceChain
-    properties:
-      resources: {get_param: Services}
-      concurrent: true
-      resource_properties:
-        ServiceNetMap: {get_param: ServiceNetMap}
-        EndpointMap: {get_param: EndpointMap}
-        DefaultPasswords: {get_param: DefaultPasswords}
-        RoleName: {get_param: RoleName}
-        RoleParameters: {get_param: RoleParameters}
-
-  LoggingConfiguration:
-    type: OS::TripleO::LoggingConfiguration
-
-  ServiceServerMetadataHook:
-    type: OS::TripleO::ServiceServerMetadataHook
-    properties:
-      RoleData: {get_attr: [ServiceChain, role_data]}
-
-outputs:
-  role_data:
-    description: Combined Role data for this set of services.
-    value:
-      service_names:
-        {get_attr: [ServiceChain, role_data, service_name]}
-      monitoring_subscriptions:
-        yaql:
-          expression: list($.data.role_data.where($ != null).select($.get('monitoring_subscription')).where($ != null))
-          data: {role_data: {get_attr: [ServiceChain, role_data]}}
-      logging_sources:
-        # Transform the individual logging_source configuration from
-        # each service in the chain into a global list, adding some
-        # default configuration at the same time.
-        yaql:
-          expression: >
-            let(
-            default_format => $.data.default_format,
-            pos_file_path => $.data.pos_file_path,
-            sources => $.data.sources.flatten()
-            ) ->
-            $sources.where($ != null).select({
-            'type' => 'tail',
-            'tag' => $.tag,
-            'path' => $.path,
-            'format' => $.get('format', $default_format),
-            'pos_file' => $.get('pos_file', $pos_file_path + '/' + $.tag + '.pos')
-            })
-          data:
-            sources:
-              - {get_attr: [LoggingConfiguration, LoggingDefaultSources]}
-              - yaql:
-                  expression: list($.data.role_data.where($ != null).select($.get('logging_source')).where($ != null))
-                  data: {role_data: {get_attr: [ServiceChain, role_data]}}
-
-              - {get_attr: [LoggingConfiguration, LoggingExtraSources]}
-            default_format: {get_attr: [LoggingConfiguration, LoggingDefaultFormat]}
-            pos_file_path: {get_attr: [LoggingConfiguration, LoggingPosFilePath]}
-      logging_groups:
-        # Build a list of unique groups to which we should add the
-        # fluentd user.
-        yaql:
-          expression: >
-            set(($.data.default + $.data.extra + $.data.role_data.where($ != null).select($.get('logging_groups'))).flatten()).where($)
-          data:
-            default: {get_attr: [LoggingConfiguration, LoggingDefaultGroups]}
-            extra: {get_attr: [LoggingConfiguration, LoggingExtraGroups]}
-            role_data: {get_attr: [ServiceChain, role_data]}
-      config_settings: {map_merge: {get_attr: [ServiceChain, role_data, config_settings]}}
-      global_config_settings:
-        map_merge:
-          yaql:
-            expression: list($.data.role_data.where($ != null).select($.get('global_config_settings')).where($ != null))
-            data: {role_data: {get_attr: [ServiceChain, role_data]}}
-      service_config_settings:
-        yaql:
-          expression: $.data.role_data.where($ != null).select($.get('service_config_settings')).where($ != null).reduce($1.mergeWith($2), {})
-          data: {role_data: {get_attr: [ServiceChain, role_data]}}
-      step_config: {get_attr: [ServiceChain, role_data, step_config]}
-      upgrade_tasks:
-        yaql:
-          # Note we use distinct() here to filter any identical tasks, e.g yum update for all services
-          expression: $.data.where($ != null).select($.get('upgrade_tasks')).where($ != null).flatten().distinct()
-          data: {get_attr: [ServiceChain, role_data]}
-      upgrade_batch_tasks:
-        yaql:
-          # Note we use distinct() here to filter any identical tasks, e.g yum update for all services
-          expression: $.data.where($ != null).select($.get('upgrade_batch_tasks')).where($ != null).flatten().distinct()
-          data: {get_attr: [ServiceChain, role_data]}
-      service_metadata_settings: {get_attr: [ServiceServerMetadataHook, metadata]}