Browse Source

Use server side env merging for ServiceNetMap/VipSubnetMap

This simplifies the ServiceNetMap/VipSubnetMap interfaces
to use parameter merge strategy and removes the *Defaults
interfaces.

Change-Id: Ic73628a596e9051b5c02435b712643f9ef7425e3
changes/25/785825/2
ramishra 4 months ago
parent
commit
b253d564f7
  1. 4
      ci/environments/disable-unbound.yaml
  2. 4
      ci/environments/multinode-core.yaml
  3. 4
      common/services/role.role.j2.yaml
  4. 6
      deployment/README.rst
  5. 4
      deployment/aide/aide-baremetal-ansible.yaml
  6. 4
      deployment/aodh/aodh-api-container-puppet.yaml
  7. 4
      deployment/aodh/aodh-base.yaml
  8. 4
      deployment/aodh/aodh-evaluator-container-puppet.yaml
  9. 4
      deployment/aodh/aodh-listener-container-puppet.yaml
  10. 4
      deployment/aodh/aodh-notifier-container-puppet.yaml
  11. 4
      deployment/apache/apache-baremetal-puppet.j2.yaml
  12. 4
      deployment/auditd/auditd-baremetal-puppet.yaml
  13. 4
      deployment/backup-and-restore/rear-baremetal-ansible.yaml
  14. 4
      deployment/barbican/barbican-api-container-puppet.yaml
  15. 4
      deployment/barbican/barbican-backend-dogtag-puppet.yaml
  16. 4
      deployment/barbican/barbican-backend-kmip-puppet.yaml
  17. 4
      deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml
  18. 4
      deployment/barbican/barbican-backend-simple-crypto-puppet.yaml
  19. 4
      deployment/barbican/barbican-client-puppet.yaml
  20. 4
      deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
  21. 4
      deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
  22. 4
      deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
  23. 4
      deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
  24. 4
      deployment/ceilometer/ceilometer-base-container-puppet.yaml
  25. 4
      deployment/ceph-ansible/ceph-base.yaml
  26. 4
      deployment/ceph-ansible/ceph-client.yaml
  27. 4
      deployment/ceph-ansible/ceph-external.yaml
  28. 4
      deployment/ceph-ansible/ceph-grafana.yaml
  29. 4
      deployment/ceph-ansible/ceph-mds.yaml
  30. 4
      deployment/ceph-ansible/ceph-mgr.yaml
  31. 4
      deployment/ceph-ansible/ceph-mon.yaml
  32. 4
      deployment/ceph-ansible/ceph-nfs.yaml
  33. 4
      deployment/ceph-ansible/ceph-osd.yaml
  34. 4
      deployment/ceph-ansible/ceph-rbdmirror.yaml
  35. 4
      deployment/ceph-ansible/ceph-rgw.yaml
  36. 4
      deployment/cephadm/ceph-base.yaml
  37. 4
      deployment/cephadm/ceph-client.yaml
  38. 4
      deployment/cephadm/ceph-external.yaml
  39. 4
      deployment/cephadm/ceph-grafana.yaml
  40. 4
      deployment/cephadm/ceph-mds.yaml
  41. 4
      deployment/cephadm/ceph-mgr.yaml
  42. 4
      deployment/cephadm/ceph-mon.yaml
  43. 4
      deployment/cephadm/ceph-nfs.yaml
  44. 4
      deployment/cephadm/ceph-osd.yaml
  45. 4
      deployment/cephadm/ceph-rbdmirror.yaml
  46. 4
      deployment/cephadm/ceph-rgw.yaml
  47. 4
      deployment/certs/ca-certs-baremetal-puppet.yaml
  48. 4
      deployment/cinder/cinder-api-container-puppet.yaml
  49. 4
      deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml
  50. 4
      deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml
  51. 4
      deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml
  52. 4
      deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml
  53. 4
      deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml
  54. 4
      deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml
  55. 4
      deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml
  56. 4
      deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml
  57. 4
      deployment/cinder/cinder-backend-dellsc-puppet.yaml
  58. 4
      deployment/cinder/cinder-backend-netapp-puppet.yaml
  59. 4
      deployment/cinder/cinder-backend-nvmeof-puppet.yaml
  60. 4
      deployment/cinder/cinder-backend-pure-puppet.yaml
  61. 4
      deployment/cinder/cinder-backup-container-puppet.yaml
  62. 4
      deployment/cinder/cinder-backup-pacemaker-puppet.yaml
  63. 4
      deployment/cinder/cinder-base.yaml
  64. 4
      deployment/cinder/cinder-common-container-puppet.yaml
  65. 4
      deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml
  66. 4
      deployment/cinder/cinder-scheduler-container-puppet.yaml
  67. 4
      deployment/cinder/cinder-volume-container-puppet.yaml
  68. 4
      deployment/cinder/cinder-volume-pacemaker-puppet.yaml
  69. 4
      deployment/clients/openstack-clients-baremetal-ansible.yaml
  70. 4
      deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml
  71. 4
      deployment/containers-common.yaml
  72. 4
      deployment/database/mysql-base.yaml
  73. 4
      deployment/database/mysql-client.yaml
  74. 4
      deployment/database/mysql-container-puppet.yaml
  75. 4
      deployment/database/mysql-pacemaker-puppet.yaml
  76. 4
      deployment/database/redis-base-puppet.yaml
  77. 4
      deployment/database/redis-container-puppet.yaml
  78. 4
      deployment/database/redis-pacemaker-puppet.yaml
  79. 4
      deployment/deprecated/cavium/liquidio-compute-config-container-puppet.yaml
  80. 4
      deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml
  81. 4
      deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml
  82. 4
      deployment/deprecated/mistral/mistral-api-container-puppet.yaml
  83. 4
      deployment/deprecated/mistral/mistral-base.yaml
  84. 4
      deployment/deprecated/mistral/mistral-engine-container-puppet.yaml
  85. 4
      deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml
  86. 4
      deployment/deprecated/mistral/mistral-executor-container-puppet.yaml
  87. 4
      deployment/deprecated/multipathd-container.yaml
  88. 4
      deployment/deprecated/novajoin/ipaclient-baremetal-ansible.yaml
  89. 4
      deployment/deprecated/novajoin/novajoin-container-puppet.yaml
  90. 4
      deployment/deprecated/zaqar/zaqar-container-puppet.yaml
  91. 4
      deployment/etcd/etcd-container-puppet.yaml
  92. 4
      deployment/experimental/designate/designate-api-container-puppet.yaml
  93. 4
      deployment/experimental/designate/designate-base.yaml
  94. 4
      deployment/experimental/designate/designate-bind-container.yaml
  95. 4
      deployment/experimental/designate/designate-central-container-puppet.yaml
  96. 4
      deployment/experimental/designate/designate-mdns-container-puppet.yaml
  97. 4
      deployment/experimental/designate/designate-producer-container-puppet.yaml
  98. 4
      deployment/experimental/designate/designate-sink-container-puppet.yaml
  99. 4
      deployment/experimental/designate/designate-worker-container-puppet.yaml
  100. 4
      deployment/frr/frr-container-ansible.yaml

4
ci/environments/disable-unbound.yaml

@ -14,8 +14,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
ci/environments/multinode-core.yaml

@ -7,8 +7,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
EndpointMap:
default: {}

4
common/services/role.role.j2.yaml

@ -17,8 +17,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
EndpointMap:
default: {}

6
deployment/README.rst

@ -193,9 +193,9 @@ the services. Following are the list of default parameters:
* ServiceNetMap: Mapping of service_name -> network name. Default mappings
for service to network names are defined in
../network/service_net_map.j2.yaml, which may be overridden via
ServiceNetMap values added to a user environment file via
parameter_defaults.
./overcloud-resource-registry-puppet.j2.yaml, which may be overridden via
ServiceNetMap values added to a user environment file via parameter_defaults.
Use parameter_merge_strategies to merge it with the defaults.
* EndpointMap: Mapping of service endpoint -> protocol. Contains a mapping of
endpoint data generated for all services, based on the data included in

4
deployment/aide/aide-baremetal-ansible.yaml

@ -6,8 +6,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/aodh/aodh-api-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/aodh/aodh-base.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/aodh/aodh-evaluator-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/aodh/aodh-listener-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/aodh/aodh-notifier-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/apache/apache-baremetal-puppet.j2.yaml

@ -20,8 +20,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/auditd/auditd-baremetal-puppet.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/backup-and-restore/rear-baremetal-ansible.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
EndpointMap:
default: {}

4
deployment/barbican/barbican-api-container-puppet.yaml

@ -28,8 +28,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
EnableSQLAlchemyCollectd:
type: boolean

4
deployment/barbican/barbican-backend-dogtag-puppet.yaml

@ -12,8 +12,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/barbican/barbican-backend-kmip-puppet.yaml

@ -12,8 +12,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml

@ -12,8 +12,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/barbican/barbican-backend-simple-crypto-puppet.yaml

@ -12,8 +12,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/barbican/barbican-client-puppet.yaml

@ -16,8 +16,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml

@ -27,8 +27,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml

@ -27,8 +27,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml

@ -27,8 +27,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceilometer/ceilometer-base-container-puppet.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceph-ansible/ceph-base.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
CephDashboardAdminPassword:
description: Admin password for the dashboard component

4
deployment/ceph-ansible/ceph-client.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceph-ansible/ceph-external.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceph-ansible/ceph-grafana.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceph-ansible/ceph-mds.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceph-ansible/ceph-mgr.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceph-ansible/ceph-mon.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceph-ansible/ceph-nfs.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceph-ansible/ceph-osd.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceph-ansible/ceph-rbdmirror.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/ceph-ansible/ceph-rgw.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cephadm/ceph-base.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
DefaultPasswords:
default: {}

4
deployment/cephadm/ceph-client.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
DefaultPasswords:
default: {}

4
deployment/cephadm/ceph-external.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
DefaultPasswords:
default: {}

4
deployment/cephadm/ceph-grafana.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
DefaultPasswords:
default: {}

4
deployment/cephadm/ceph-mds.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
DefaultPasswords:
default: {}

4
deployment/cephadm/ceph-mgr.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
DefaultPasswords:
default: {}

4
deployment/cephadm/ceph-mon.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
DefaultPasswords:
default: {}

4
deployment/cephadm/ceph-nfs.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
DefaultPasswords:
default: {}

4
deployment/cephadm/ceph-osd.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
DefaultPasswords:
default: {}

4
deployment/cephadm/ceph-rbdmirror.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
DefaultPasswords:
default: {}

4
deployment/cephadm/ceph-rgw.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
DefaultPasswords:
default: {}

4
deployment/certs/ca-certs-baremetal-puppet.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-api-container-puppet.yaml

@ -27,8 +27,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml

@ -100,8 +100,8 @@ parameters:
type: json
default: {}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
RoleName:
type: string
default: ''

4
deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml

@ -66,8 +66,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml

@ -62,8 +62,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml

@ -96,8 +96,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml

@ -53,8 +53,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml

@ -40,8 +40,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml

@ -69,8 +69,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml

@ -79,8 +79,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-backend-dellsc-puppet.yaml

@ -85,8 +85,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-backend-netapp-puppet.yaml

@ -10,8 +10,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-backend-nvmeof-puppet.yaml

@ -38,8 +38,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-backend-pure-puppet.yaml

@ -24,8 +24,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-backup-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-backup-pacemaker-puppet.yaml

@ -48,8 +48,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-base.yaml

@ -32,8 +32,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-common-container-puppet.yaml

@ -17,8 +17,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml

@ -36,8 +36,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-scheduler-container-puppet.yaml

@ -27,8 +27,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-volume-container-puppet.yaml

@ -31,8 +31,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/cinder/cinder-volume-pacemaker-puppet.yaml

@ -36,8 +36,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/clients/openstack-clients-baremetal-ansible.yaml

@ -6,8 +6,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml

@ -16,8 +16,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/containers-common.yaml

@ -18,8 +18,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/database/mysql-base.yaml

@ -12,8 +12,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/database/mysql-client.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/database/mysql-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/database/mysql-pacemaker-puppet.yaml

@ -36,8 +36,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
MysqlRootPassword:
type: string

4
deployment/database/redis-base-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/database/redis-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/database/redis-pacemaker-puppet.yaml

@ -36,8 +36,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/deprecated/cavium/liquidio-compute-config-container-puppet.yaml

@ -21,8 +21,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml

@ -103,8 +103,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml

@ -84,8 +84,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/deprecated/mistral/mistral-api-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/deprecated/mistral/mistral-base.yaml

@ -11,8 +11,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/deprecated/mistral/mistral-engine-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/deprecated/mistral/mistral-executor-container-puppet.yaml

@ -26,8 +26,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/deprecated/multipathd-container.yaml

@ -34,8 +34,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/deprecated/novajoin/ipaclient-baremetal-ansible.yaml

@ -13,8 +13,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/deprecated/novajoin/novajoin-container-puppet.yaml

@ -21,8 +21,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
ServiceData:
default: {}

4
deployment/deprecated/zaqar/zaqar-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/etcd/etcd-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json
RoleName:
default: ''

4
deployment/experimental/designate/designate-api-container-puppet.yaml

@ -22,8 +22,8 @@ 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.
via parameter_defaults in the resource registry. Use
parameter_merge_strategies to merge it with the defaults.
type: json