Browse Source

Pass ServiceNetMap to services

This will be needed to pick the network where the service has
to bind to from within the service template.

Change-Id: I52652e1ad8c7b360efd2c7af199e35932aaaea8c
changes/14/354414/14
Giulio Fidente 5 years ago
committed by Dan Prince
parent
commit
885b37c80e
  1. 6
      overcloud.yaml
  2. 7
      puppet/services/aodh-api.yaml
  3. 6
      puppet/services/aodh-base.yaml
  4. 7
      puppet/services/aodh-evaluator.yaml
  5. 7
      puppet/services/aodh-listener.yaml
  6. 7
      puppet/services/aodh-notifier.yaml
  7. 7
      puppet/services/ceilometer-agent-central.yaml
  8. 7
      puppet/services/ceilometer-agent-compute.yaml
  9. 7
      puppet/services/ceilometer-agent-notification.yaml
  10. 7
      puppet/services/ceilometer-api.yaml
  11. 6
      puppet/services/ceilometer-base.yaml
  12. 7
      puppet/services/ceilometer-collector.yaml
  13. 7
      puppet/services/ceilometer-expirer.yaml
  14. 11
      puppet/services/ceph-base.yaml
  15. 9
      puppet/services/ceph-client.yaml
  16. 11
      puppet/services/ceph-external.yaml
  17. 9
      puppet/services/ceph-mon.yaml
  18. 9
      puppet/services/ceph-osd.yaml
  19. 7
      puppet/services/cinder-api.yaml
  20. 7
      puppet/services/cinder-backup.yaml
  21. 6
      puppet/services/cinder-base.yaml
  22. 7
      puppet/services/cinder-scheduler.yaml
  23. 7
      puppet/services/cinder-volume.yaml
  24. 11
      puppet/services/database/mongodb-base.yaml
  25. 9
      puppet/services/database/mongodb.yaml
  26. 6
      puppet/services/database/mysql.yaml
  27. 11
      puppet/services/database/redis-base.yaml
  28. 9
      puppet/services/database/redis.yaml
  29. 6
      puppet/services/glance-api.yaml
  30. 6
      puppet/services/glance-registry.yaml
  31. 7
      puppet/services/gnocchi-api.yaml
  32. 6
      puppet/services/gnocchi-base.yaml
  33. 7
      puppet/services/gnocchi-metricd.yaml
  34. 7
      puppet/services/gnocchi-statsd.yaml
  35. 6
      puppet/services/haproxy.yaml
  36. 9
      puppet/services/heat-api-cfn.yaml
  37. 9
      puppet/services/heat-api-cloudwatch.yaml
  38. 9
      puppet/services/heat-api.yaml
  39. 11
      puppet/services/heat-base.yaml
  40. 9
      puppet/services/heat-engine.yaml
  41. 6
      puppet/services/horizon.yaml
  42. 7
      puppet/services/ironic-api.yaml
  43. 6
      puppet/services/ironic-base.yaml
  44. 7
      puppet/services/ironic-conductor.yaml
  45. 6
      puppet/services/keepalived.yaml
  46. 6
      puppet/services/kernel.yaml
  47. 6
      puppet/services/keystone.yaml
  48. 7
      puppet/services/manila-api.yaml
  49. 6
      puppet/services/manila-base.yaml
  50. 7
      puppet/services/manila-scheduler.yaml
  51. 7
      puppet/services/manila-share.yaml
  52. 6
      puppet/services/memcached.yaml
  53. 9
      puppet/services/neutron-api.yaml
  54. 11
      puppet/services/neutron-base.yaml
  55. 6
      puppet/services/neutron-compute-plugin-midonet.yaml
  56. 6
      puppet/services/neutron-compute-plugin-nuage.yaml
  57. 6
      puppet/services/neutron-compute-plugin-opencontrail.yaml
  58. 6
      puppet/services/neutron-compute-plugin-plumgrid.yaml
  59. 9
      puppet/services/neutron-dhcp.yaml
  60. 9
      puppet/services/neutron-l3-compute-dvr.yaml
  61. 9
      puppet/services/neutron-l3.yaml
  62. 9
      puppet/services/neutron-metadata.yaml
  63. 6
      puppet/services/neutron-midonet.yaml
  64. 9
      puppet/services/neutron-ovs-agent.yaml
  65. 9
      puppet/services/neutron-plugin-ml2.yaml
  66. 9
      puppet/services/neutron-plugin-nuage.yaml
  67. 9
      puppet/services/neutron-plugin-opencontrail.yaml
  68. 6
      puppet/services/neutron-plugin-plumgrid.yaml
  69. 7
      puppet/services/nova-api.yaml
  70. 6
      puppet/services/nova-base.yaml
  71. 7
      puppet/services/nova-compute.yaml
  72. 7
      puppet/services/nova-conductor.yaml
  73. 7
      puppet/services/nova-consoleauth.yaml
  74. 7
      puppet/services/nova-ironic.yaml
  75. 7
      puppet/services/nova-libvirt.yaml
  76. 7
      puppet/services/nova-scheduler.yaml
  77. 7
      puppet/services/nova-vncproxy.yaml
  78. 6
      puppet/services/pacemaker.yaml
  79. 7
      puppet/services/pacemaker/ceilometer-agent-central.yaml
  80. 7
      puppet/services/pacemaker/ceilometer-agent-notification.yaml
  81. 7
      puppet/services/pacemaker/ceilometer-api.yaml
  82. 7
      puppet/services/pacemaker/ceilometer-collector.yaml
  83. 7
      puppet/services/pacemaker/cinder-api.yaml
  84. 7
      puppet/services/pacemaker/cinder-backup.yaml
  85. 7
      puppet/services/pacemaker/cinder-scheduler.yaml
  86. 7
      puppet/services/pacemaker/cinder-volume.yaml
  87. 6
      puppet/services/pacemaker/core.yaml
  88. 9
      puppet/services/pacemaker/database/mongodb.yaml
  89. 6
      puppet/services/pacemaker/database/mysql.yaml
  90. 9
      puppet/services/pacemaker/database/redis.yaml
  91. 7
      puppet/services/pacemaker/glance-api.yaml
  92. 7
      puppet/services/pacemaker/glance-registry.yaml
  93. 7
      puppet/services/pacemaker/gnocchi-api.yaml
  94. 7
      puppet/services/pacemaker/gnocchi-metricd.yaml
  95. 7
      puppet/services/pacemaker/gnocchi-statsd.yaml
  96. 7
      puppet/services/pacemaker/haproxy.yaml
  97. 7
      puppet/services/pacemaker/heat-api-cfn.yaml
  98. 7
      puppet/services/pacemaker/heat-api-cloudwatch.yaml
  99. 7
      puppet/services/pacemaker/heat-api.yaml
  100. 7
      puppet/services/pacemaker/heat-engine.yaml

6
overcloud.yaml

@ -382,6 +382,7 @@ resources:
type: OS::TripleO::Services
properties:
Services: {get_param: ControllerServices}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
Controller:
@ -416,10 +417,10 @@ resources:
ServiceNames: {get_attr: [ControllerServiceChain, role_data, service_names]}
ComputeServiceChain:
type: OS::TripleO::Services
properties:
Services: {get_param: ComputeServices}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
Compute:
@ -452,6 +453,7 @@ resources:
type: OS::TripleO::Services
properties:
Services: {get_param: BlockStorageServices}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
BlockStorage:
@ -482,6 +484,7 @@ resources:
type: OS::TripleO::Services
properties:
Services: {get_param: ObjectStorageServices}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
ObjectStorage:
@ -513,6 +516,7 @@ resources:
type: OS::TripleO::Services
properties:
Services: {get_param: CephStorageServices}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
CephStorage:

7
puppet/services/aodh-api.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Aodh API 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -14,6 +20,7 @@ resources:
AodhBase:
type: ./aodh-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

6
puppet/services/aodh-base.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Aodh 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

7
puppet/services/aodh-evaluator.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Aodh Evaluator 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -14,6 +20,7 @@ resources:
AodhBase:
type: ./aodh-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

7
puppet/services/aodh-listener.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Aodh Listener 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -14,6 +20,7 @@ resources:
AodhBase:
type: ./aodh-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

7
puppet/services/aodh-notifier.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Aodh Notifier 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -14,6 +20,7 @@ resources:
AodhBase:
type: ./aodh-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

7
puppet/services/ceilometer-agent-central.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Ceilometer Central Agent 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -18,6 +24,7 @@ resources:
CeilometerServiceBase:
type: ./ceilometer-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

7
puppet/services/ceilometer-agent-compute.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Ceilometer Compute Agent 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -14,6 +20,7 @@ resources:
CeilometerServiceBase:
type: ./ceilometer-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

7
puppet/services/ceilometer-agent-notification.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Ceilometer Notification Agent 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -15,6 +21,7 @@ resources:
CeilometerServiceBase:
type: ./ceilometer-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

7
puppet/services/ceilometer-api.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Ceilometer API 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -15,6 +21,7 @@ resources:
CeilometerServiceBase:
type: ./ceilometer-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

6
puppet/services/ceilometer-base.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Ceilometer 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

7
puppet/services/ceilometer-collector.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Ceilometer Collector 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -14,6 +20,7 @@ resources:
CeilometerServiceBase:
type: ./ceilometer-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

7
puppet/services/ceilometer-expirer.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Ceilometer Expirer 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -15,6 +21,7 @@ resources:
CeilometerServiceBase:
type: ./ceilometer-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

11
puppet/services/ceph-base.yaml

@ -36,6 +36,17 @@ parameters:
NovaRbdPoolName:
default: vms
type: string
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
# DEPRECATED options for compatibility with overcloud.yaml
# This should be removed and manipulation of the ControllerServices list
# used instead, but we need client support for that first

9
puppet/services/ceph-client.yaml

@ -4,6 +4,12 @@ description: >
Ceph Client service.
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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -13,6 +19,9 @@ parameters:
resources:
CephBase:
type: ./ceph-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:

11
puppet/services/ceph-external.yaml

@ -33,6 +33,17 @@ parameters:
NovaRbdPoolName:
default: vms
type: string
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
outputs:
role_data:

9
puppet/services/ceph-mon.yaml

@ -4,6 +4,12 @@ description: >
Ceph Monitor service.
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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -48,6 +54,9 @@ parameters:
resources:
CephBase:
type: ./ceph-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:

9
puppet/services/ceph-osd.yaml

@ -4,6 +4,12 @@ description: >
Ceph OSD service.
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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -13,6 +19,9 @@ parameters:
resources:
CephBase:
type: ./ceph-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:

7
puppet/services/cinder-api.yaml

@ -13,6 +13,12 @@ parameters:
description: The password for the cinder service account, used by cinder-api.
type: string
hidden: true
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
@ -28,6 +34,7 @@ resources:
CinderBase:
type: ./cinder-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

7
puppet/services/cinder-backup.yaml

@ -16,6 +16,12 @@ parameters:
CephClientUserName:
default: openstack
type: string
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
@ -27,6 +33,7 @@ resources:
CinderBase:
type: ./cinder-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

6
puppet/services/cinder-base.yaml

@ -12,6 +12,12 @@ parameters:
default: ''
description: Set to True to enable debugging on all services.
type: string
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

7
puppet/services/cinder-scheduler.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Cinder Scheduler 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -15,6 +21,7 @@ resources:
CinderBase:
type: ./cinder-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

7
puppet/services/cinder-volume.yaml

@ -42,6 +42,12 @@ parameters:
CephClientUserName:
default: openstack
type: string
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
@ -53,6 +59,7 @@ resources:
CinderBase:
type: ./cinder-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

11
puppet/services/database/mongodb-base.yaml

@ -15,6 +15,17 @@ parameters:
MongoDbReplset:
type: string
default: "tripleo"
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
outputs:
aux_parameters:

9
puppet/services/database/mongodb.yaml

@ -5,6 +5,12 @@ description: >
parameters:
#Parameters not used EndpointMap
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
@ -14,6 +20,9 @@ parameters:
resources:
MongoDbBase:
type: ./mongodb-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:

6
puppet/services/database/mysql.yaml

@ -5,6 +5,12 @@ description: >
parameters:
#Parameters not used EndpointMap
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

11
puppet/services/database/redis-base.yaml

@ -8,6 +8,17 @@ parameters:
description: The password for Redis
type: string
hidden: true
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
outputs:
role_data:

9
puppet/services/database/redis.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Redis 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -13,6 +19,9 @@ parameters:
resources:
RedisBase:
type: ./redis-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:

6
puppet/services/glance-api.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Glance API 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

6
puppet/services/glance-registry.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Glance Registry 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

7
puppet/services/gnocchi-api.yaml

@ -4,6 +4,12 @@ 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -29,6 +35,7 @@ resources:
GnocchiServiceBase:
type: ./gnocchi-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

6
puppet/services/gnocchi-base.yaml

@ -4,6 +4,12 @@ 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

7
puppet/services/gnocchi-metricd.yaml

@ -4,6 +4,12 @@ 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -14,6 +20,7 @@ resources:
GnocchiServiceBase:
type: ./gnocchi-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

7
puppet/services/gnocchi-statsd.yaml

@ -4,6 +4,12 @@ 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -14,6 +20,7 @@ resources:
GnocchiServiceBase:
type: ./gnocchi-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

6
puppet/services/haproxy.yaml

@ -4,6 +4,12 @@ description: >
HAproxy 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

9
puppet/services/heat-api-cfn.yaml

@ -4,6 +4,12 @@ description: >
Openstack Heat CloudFormation API 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -25,6 +31,9 @@ parameters:
resources:
HeatBase:
type: ./heat-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:

9
puppet/services/heat-api-cloudwatch.yaml

@ -4,6 +4,12 @@ description: >
Openstack Heat CloudWatch API 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -17,6 +23,9 @@ parameters:
resources:
HeatBase:
type: ./heat-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:

9
puppet/services/heat-api.yaml

@ -4,6 +4,12 @@ description: >
Openstack Heat API 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -25,6 +31,9 @@ parameters:
resources:
HeatBase:
type: ./heat-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:

11
puppet/services/heat-base.yaml

@ -26,6 +26,17 @@ parameters:
default: 5672
description: Set rabbit subscriber port, change this if using SSL
type: number
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
outputs:
role_data:

9
puppet/services/heat-engine.yaml

@ -4,6 +4,12 @@ description: >
Openstack Heat Engine 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -30,6 +36,9 @@ parameters:
resources:
HeatBase:
type: ./heat-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:

6
puppet/services/horizon.yaml

@ -4,6 +4,12 @@ description: >
Horizon 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

7
puppet/services/ironic-api.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Ironic API 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -18,6 +24,7 @@ resources:
IronicBase:
type: ./ironic-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

6
puppet/services/ironic-base.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Ironic services 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

7
puppet/services/ironic-conductor.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Ironic conductor 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -18,6 +24,7 @@ resources:
IronicBase:
type: ./ironic-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

6
puppet/services/keepalived.yaml

@ -4,6 +4,12 @@ description: >
Keepalived 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

6
puppet/services/kernel.yaml

@ -4,6 +4,12 @@ description: >
Load kernel modules with kmod and configure kernel options with sysctl.
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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

6
puppet/services/keystone.yaml

@ -32,6 +32,12 @@ parameters:
type: string
default: 'regionOne'
description: Keystone region for endpoint
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

7
puppet/services/manila-api.yaml

@ -4,6 +4,12 @@ description: >
Manila-api 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -22,6 +28,7 @@ resources:
ManilaBase:
type: ./manila-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

6
puppet/services/manila-base.yaml

@ -4,6 +4,12 @@ description: >
Openstack Manila base service. Shared by manila-api/scheduler/share services
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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

7
puppet/services/manila-scheduler.yaml

@ -4,6 +4,12 @@ description: >
Manila-scheduler 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -26,6 +32,7 @@ resources:
ManilaBase:
type: ./manila-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

7
puppet/services/manila-share.yaml

@ -4,6 +4,12 @@ description: >
Manila-share 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -14,6 +20,7 @@ resources:
ManilaBase:
type: ./manila-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:

6
puppet/services/memcached.yaml

@ -4,6 +4,12 @@ description: >
Memcached 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

9
puppet/services/neutron-api.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Neutron Server 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -42,6 +48,9 @@ resources:
NeutronBase:
type: ./neutron-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:

11
puppet/services/neutron-base.yaml

@ -48,6 +48,17 @@ parameters:
description: >
Remove configuration that is not generated by TripleO. Setting
to false may result in configuration remnants after updates/upgrades.
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
outputs:
role_data:

6
puppet/services/neutron-compute-plugin-midonet.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Neutron Compute Midonet plugin
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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

6
puppet/services/neutron-compute-plugin-nuage.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Neutron Compute Nuage plugin
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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

6
puppet/services/neutron-compute-plugin-opencontrail.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Neutron Compute OpenContrail plugin
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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

6
puppet/services/neutron-compute-plugin-plumgrid.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Neutron Compute Plumgrid plugin
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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set

9
puppet/services/neutron-dhcp.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Neutron DHCP agent 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -18,6 +24,9 @@ resources:
NeutronBase:
type: ./neutron-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:

9
puppet/services/neutron-l3-compute-dvr.yaml

@ -5,6 +5,12 @@ description: >
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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -22,6 +28,9 @@ resources:
NeutronBase:
type: ./neutron-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:

9
puppet/services/neutron-l3.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Neutron L3 agent 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -30,6 +36,9 @@ resources:
NeutronBase:
type: ./neutron-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:

9
puppet/services/neutron-metadata.yaml

@ -4,6 +4,12 @@ description: >
OpenStack Neutron Metadata agent 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -26,6 +32,9 @@ resources:
NeutronBase: