heat_template_version: ocata

description: >
  Gnocchi service configured with Puppet

parameters:
  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
  DefaultPasswords:
    default: {}
    type: json
  EndpointMap:
    default: {}
    description: Mapping of service endpoint -> protocol. Typically set
                 via parameter_defaults in the resource registry.
    type: json
  MonitoringSubscriptionGnocchiMetricd:
    default: 'overcloud-gnocchi-metricd'
    type: string
  GnocchiMetricdWorkers:
    default: ''
    description: Number of workers for Gnocchi MetricD
    type: string

resources:
  GnocchiServiceBase:
    type: ./gnocchi-base.yaml
    properties:
      ServiceNetMap: {get_param: ServiceNetMap}
      DefaultPasswords: {get_param: DefaultPasswords}
      EndpointMap: {get_param: EndpointMap}

outputs:
  role_data:
    description: Role data for the Gnocchi role.
    value:
      service_name: gnocchi_metricd
      monitoring_subscription: {get_param: MonitoringSubscriptionGnocchiMetricd}
      config_settings:
        map_merge:
          - get_attr: [GnocchiServiceBase, role_data, config_settings]
          - gnocchi::metricd::workers: {get_param: GnocchiMetricdWorkers}
      step_config: |
        include ::tripleo::profile::base::gnocchi::metricd

heat_template_version: ocata

description: >
  Gnocchi service configured with Puppet

parameters:
  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
  DefaultPasswords:
    default: {}
    type: json
  EndpointMap:
    default: {}
    description: Mapping of service endpoint -> protocol. Typically set
                 via parameter_defaults in the resource registry.
    type: json
  MonitoringSubscriptionGnocchiMetricd:
    default: 'overcloud-gnocchi-metricd'
    type: string
  GnocchiMetricdWorkers:
    default: '%{::os_workers}'
    description: Number of workers for Gnocchi MetricD
    type: string

resources:
  GnocchiServiceBase:
    type: ./gnocchi-base.yaml
    properties:
      ServiceNetMap: {get_param: ServiceNetMap}
      DefaultPasswords: {get_param: DefaultPasswords}
      EndpointMap: {get_param: EndpointMap}

outputs:
  role_data:
    description: Role data for the Gnocchi role.
    value:
      service_name: gnocchi_metricd
      monitoring_subscription: {get_param: MonitoringSubscriptionGnocchiMetricd}
      config_settings:
        map_merge:
          - get_attr: [GnocchiServiceBase, role_data, config_settings]
          - gnocchi::metricd::workers: {get_param: GnocchiMetricdWorkers}
      step_config: |
        include ::tripleo::profile::base::gnocchi::metricd

Set the correct default for gnocchi workers
Set the correct default for gnocchi workers

The current default is empty which overrides the puppet-gnocchi
os_workers calculated value. Instead default to the os_workers.

Change-Id: I9bf9a107c03172500f7c8c5e4353c20305c8e6b5
