diff --git a/ci/environments/disable-unbound.yaml b/ci/environments/disable-unbound.yaml index 5dc00dfaf8..0e04b8cf66 100644 --- a/ci/environments/disable-unbound.yaml +++ b/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: '' diff --git a/ci/environments/multinode-core.yaml b/ci/environments/multinode-core.yaml index 9dfec0c547..038ebe755c 100644 --- a/ci/environments/multinode-core.yaml +++ b/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: {} diff --git a/common/services/role.role.j2.yaml b/common/services/role.role.j2.yaml index 6ec457e604..6030f22135 100644 --- a/common/services/role.role.j2.yaml +++ b/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: {} diff --git a/deployment/README.rst b/deployment/README.rst index e2c9c32532..f9cee86e04 100644 --- a/deployment/README.rst +++ b/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 diff --git a/deployment/aide/aide-baremetal-ansible.yaml b/deployment/aide/aide-baremetal-ansible.yaml index 3f80ca7a8b..b2bbecab42 100644 --- a/deployment/aide/aide-baremetal-ansible.yaml +++ b/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: '' diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index 8d83062428..8fc6c92f8b 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/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: '' diff --git a/deployment/aodh/aodh-base.yaml b/deployment/aodh/aodh-base.yaml index 01996bcfad..2eb8b4dab0 100644 --- a/deployment/aodh/aodh-base.yaml +++ b/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: '' diff --git a/deployment/aodh/aodh-evaluator-container-puppet.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml index 9e505acab8..b2f9aec13a 100644 --- a/deployment/aodh/aodh-evaluator-container-puppet.yaml +++ b/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: '' diff --git a/deployment/aodh/aodh-listener-container-puppet.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml index bdd42aeba9..5c326a5e76 100644 --- a/deployment/aodh/aodh-listener-container-puppet.yaml +++ b/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: '' diff --git a/deployment/aodh/aodh-notifier-container-puppet.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml index 985ee0e45b..87f6181209 100644 --- a/deployment/aodh/aodh-notifier-container-puppet.yaml +++ b/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: '' diff --git a/deployment/apache/apache-baremetal-puppet.j2.yaml b/deployment/apache/apache-baremetal-puppet.j2.yaml index 50e57cd55e..34947a6fa7 100644 --- a/deployment/apache/apache-baremetal-puppet.j2.yaml +++ b/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: '' diff --git a/deployment/auditd/auditd-baremetal-puppet.yaml b/deployment/auditd/auditd-baremetal-puppet.yaml index dca594e4ba..18d218651a 100644 --- a/deployment/auditd/auditd-baremetal-puppet.yaml +++ b/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: '' diff --git a/deployment/backup-and-restore/rear-baremetal-ansible.yaml b/deployment/backup-and-restore/rear-baremetal-ansible.yaml index 085ae1cb84..58bb6496f9 100644 --- a/deployment/backup-and-restore/rear-baremetal-ansible.yaml +++ b/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: {} diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index 258d59ef3a..17b255c1c0 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/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 diff --git a/deployment/barbican/barbican-backend-dogtag-puppet.yaml b/deployment/barbican/barbican-backend-dogtag-puppet.yaml index 65beb66f7d..84288d4c9e 100644 --- a/deployment/barbican/barbican-backend-dogtag-puppet.yaml +++ b/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: '' diff --git a/deployment/barbican/barbican-backend-kmip-puppet.yaml b/deployment/barbican/barbican-backend-kmip-puppet.yaml index 8e4a4a4c79..23123ca91d 100644 --- a/deployment/barbican/barbican-backend-kmip-puppet.yaml +++ b/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: '' diff --git a/deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml b/deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml index 2ec595577a..7c7b6721d2 100644 --- a/deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml +++ b/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: '' diff --git a/deployment/barbican/barbican-backend-simple-crypto-puppet.yaml b/deployment/barbican/barbican-backend-simple-crypto-puppet.yaml index 036acd0816..2e5af9daba 100644 --- a/deployment/barbican/barbican-backend-simple-crypto-puppet.yaml +++ b/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: '' diff --git a/deployment/barbican/barbican-client-puppet.yaml b/deployment/barbican/barbican-client-puppet.yaml index 144ba383cc..d2925fa118 100644 --- a/deployment/barbican/barbican-client-puppet.yaml +++ b/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: '' diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml index 8f85fe24a9..60776e0275 100644 --- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml +++ b/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: '' diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml index 49969f6d62..e993d6dfd3 100644 --- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml +++ b/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: '' diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml index 5c893bcd92..5e742ef75a 100644 --- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml +++ b/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: '' diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index 4e45768c44..ba1cb70a3c 100644 --- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml +++ b/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: '' diff --git a/deployment/ceilometer/ceilometer-base-container-puppet.yaml b/deployment/ceilometer/ceilometer-base-container-puppet.yaml index 74fa675c67..8e2ac03d6a 100644 --- a/deployment/ceilometer/ceilometer-base-container-puppet.yaml +++ b/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: '' diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml index 46f8d60ea2..e50cdc2b0b 100644 --- a/deployment/ceph-ansible/ceph-base.yaml +++ b/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 diff --git a/deployment/ceph-ansible/ceph-client.yaml b/deployment/ceph-ansible/ceph-client.yaml index b0247230fc..3eb723cb5f 100644 --- a/deployment/ceph-ansible/ceph-client.yaml +++ b/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: '' diff --git a/deployment/ceph-ansible/ceph-external.yaml b/deployment/ceph-ansible/ceph-external.yaml index 48284ec1a7..15ea179992 100644 --- a/deployment/ceph-ansible/ceph-external.yaml +++ b/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: '' diff --git a/deployment/ceph-ansible/ceph-grafana.yaml b/deployment/ceph-ansible/ceph-grafana.yaml index 9be7028306..668529d4b0 100644 --- a/deployment/ceph-ansible/ceph-grafana.yaml +++ b/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: '' diff --git a/deployment/ceph-ansible/ceph-mds.yaml b/deployment/ceph-ansible/ceph-mds.yaml index 2b2d5be987..30cd7f66c6 100644 --- a/deployment/ceph-ansible/ceph-mds.yaml +++ b/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: '' diff --git a/deployment/ceph-ansible/ceph-mgr.yaml b/deployment/ceph-ansible/ceph-mgr.yaml index 39e9acfd37..e6fe7f9daa 100644 --- a/deployment/ceph-ansible/ceph-mgr.yaml +++ b/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: '' diff --git a/deployment/ceph-ansible/ceph-mon.yaml b/deployment/ceph-ansible/ceph-mon.yaml index 37723802ba..50e1f1cc5a 100644 --- a/deployment/ceph-ansible/ceph-mon.yaml +++ b/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: '' diff --git a/deployment/ceph-ansible/ceph-nfs.yaml b/deployment/ceph-ansible/ceph-nfs.yaml index b7488189b4..ffc6f5dde2 100644 --- a/deployment/ceph-ansible/ceph-nfs.yaml +++ b/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: '' diff --git a/deployment/ceph-ansible/ceph-osd.yaml b/deployment/ceph-ansible/ceph-osd.yaml index 38cf03788f..949b8dc59c 100644 --- a/deployment/ceph-ansible/ceph-osd.yaml +++ b/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: '' diff --git a/deployment/ceph-ansible/ceph-rbdmirror.yaml b/deployment/ceph-ansible/ceph-rbdmirror.yaml index e4dfb09983..0db41664e3 100644 --- a/deployment/ceph-ansible/ceph-rbdmirror.yaml +++ b/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: '' diff --git a/deployment/ceph-ansible/ceph-rgw.yaml b/deployment/ceph-ansible/ceph-rgw.yaml index 64523ce284..5186d055d0 100644 --- a/deployment/ceph-ansible/ceph-rgw.yaml +++ b/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: '' diff --git a/deployment/cephadm/ceph-base.yaml b/deployment/cephadm/ceph-base.yaml index 277a7c6b16..ae16483c7d 100644 --- a/deployment/cephadm/ceph-base.yaml +++ b/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: {} diff --git a/deployment/cephadm/ceph-client.yaml b/deployment/cephadm/ceph-client.yaml index 8cba6ffbcf..13563d66cb 100644 --- a/deployment/cephadm/ceph-client.yaml +++ b/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: {} diff --git a/deployment/cephadm/ceph-external.yaml b/deployment/cephadm/ceph-external.yaml index 38faa0b2ff..541e072d4f 100644 --- a/deployment/cephadm/ceph-external.yaml +++ b/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: {} diff --git a/deployment/cephadm/ceph-grafana.yaml b/deployment/cephadm/ceph-grafana.yaml index 344ffe4591..47a8d357ca 100644 --- a/deployment/cephadm/ceph-grafana.yaml +++ b/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: {} diff --git a/deployment/cephadm/ceph-mds.yaml b/deployment/cephadm/ceph-mds.yaml index a22ed9cba8..3283919147 100644 --- a/deployment/cephadm/ceph-mds.yaml +++ b/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: {} diff --git a/deployment/cephadm/ceph-mgr.yaml b/deployment/cephadm/ceph-mgr.yaml index 6ff543bc27..38f2a8b024 100644 --- a/deployment/cephadm/ceph-mgr.yaml +++ b/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: {} diff --git a/deployment/cephadm/ceph-mon.yaml b/deployment/cephadm/ceph-mon.yaml index 411f38ec69..dc9f30501e 100644 --- a/deployment/cephadm/ceph-mon.yaml +++ b/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: {} diff --git a/deployment/cephadm/ceph-nfs.yaml b/deployment/cephadm/ceph-nfs.yaml index cf55660a3c..9188bb5622 100644 --- a/deployment/cephadm/ceph-nfs.yaml +++ b/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: {} diff --git a/deployment/cephadm/ceph-osd.yaml b/deployment/cephadm/ceph-osd.yaml index 10adfe16ba..5c204975f4 100644 --- a/deployment/cephadm/ceph-osd.yaml +++ b/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: {} diff --git a/deployment/cephadm/ceph-rbdmirror.yaml b/deployment/cephadm/ceph-rbdmirror.yaml index d8856f2b2f..f8b108d1be 100644 --- a/deployment/cephadm/ceph-rbdmirror.yaml +++ b/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: {} diff --git a/deployment/cephadm/ceph-rgw.yaml b/deployment/cephadm/ceph-rgw.yaml index 5d81b4c8e7..b8def0dea1 100644 --- a/deployment/cephadm/ceph-rgw.yaml +++ b/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: {} diff --git a/deployment/certs/ca-certs-baremetal-puppet.yaml b/deployment/certs/ca-certs-baremetal-puppet.yaml index 2246984ab8..2371f0a8c7 100644 --- a/deployment/certs/ca-certs-baremetal-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 102cd08419..21435b381a 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml index 63c389447f..79a2a389e4 100644 --- a/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml index eb4ffc1b57..9e267229d2 100644 --- a/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml index ed025128c3..fc071fe5c3 100644 --- a/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml index c2cd9cf216..418b8717f5 100644 --- a/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml index 2edc559910..ad63744fed 100644 --- a/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml index 5ec131ae95..3b75d3ebf6 100644 --- a/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml index b48eed1e8f..dc67fa710b 100644 --- a/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml index cf67906628..cb80034836 100644 --- a/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backend-dellsc-puppet.yaml b/deployment/cinder/cinder-backend-dellsc-puppet.yaml index a2a02acaaa..58b2631267 100644 --- a/deployment/cinder/cinder-backend-dellsc-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backend-netapp-puppet.yaml b/deployment/cinder/cinder-backend-netapp-puppet.yaml index 8cbbb9f2e0..fbeab14413 100644 --- a/deployment/cinder/cinder-backend-netapp-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backend-nvmeof-puppet.yaml b/deployment/cinder/cinder-backend-nvmeof-puppet.yaml index 806b35e0a7..7a703b96f5 100644 --- a/deployment/cinder/cinder-backend-nvmeof-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backend-pure-puppet.yaml b/deployment/cinder/cinder-backend-pure-puppet.yaml index d5e66562ce..e286c16fb8 100644 --- a/deployment/cinder/cinder-backend-pure-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml index 5287e07621..f56819506b 100644 --- a/deployment/cinder/cinder-backup-container-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index ff90662b0b..00652077ba 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-base.yaml b/deployment/cinder/cinder-base.yaml index 7ab8939bf4..b407496d7e 100644 --- a/deployment/cinder/cinder-base.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-common-container-puppet.yaml b/deployment/cinder/cinder-common-container-puppet.yaml index 739546936d..33c7c328fb 100644 --- a/deployment/cinder/cinder-common-container-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml b/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml index 8d21847e87..bf582adc07 100644 --- a/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml index 182eb8ad7c..486551be87 100644 --- a/deployment/cinder/cinder-scheduler-container-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml index 515abd3805..f8d01c82df 100644 --- a/deployment/cinder/cinder-volume-container-puppet.yaml +++ b/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: '' diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index 4e8419cc2a..0e5d5f2e53 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/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: '' diff --git a/deployment/clients/openstack-clients-baremetal-ansible.yaml b/deployment/clients/openstack-clients-baremetal-ansible.yaml index a071e9ac15..2ebdde0894 100644 --- a/deployment/clients/openstack-clients-baremetal-ansible.yaml +++ b/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: '' diff --git a/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml b/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml index 5514198f67..daa37f2d9b 100644 --- a/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml +++ b/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: '' diff --git a/deployment/containers-common.yaml b/deployment/containers-common.yaml index 1ce7a510fb..daa197ba42 100644 --- a/deployment/containers-common.yaml +++ b/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: '' diff --git a/deployment/database/mysql-base.yaml b/deployment/database/mysql-base.yaml index 3767eb7e60..52aeea183d 100644 --- a/deployment/database/mysql-base.yaml +++ b/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: '' diff --git a/deployment/database/mysql-client.yaml b/deployment/database/mysql-client.yaml index 4cd237ebdf..4a03546ae0 100644 --- a/deployment/database/mysql-client.yaml +++ b/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: '' diff --git a/deployment/database/mysql-container-puppet.yaml b/deployment/database/mysql-container-puppet.yaml index bcd7ff9beb..74af416a2d 100644 --- a/deployment/database/mysql-container-puppet.yaml +++ b/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: '' diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index 1557c72753..0e9178bb89 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/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 diff --git a/deployment/database/redis-base-puppet.yaml b/deployment/database/redis-base-puppet.yaml index 28f08cd178..588c8a29e8 100644 --- a/deployment/database/redis-base-puppet.yaml +++ b/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: '' diff --git a/deployment/database/redis-container-puppet.yaml b/deployment/database/redis-container-puppet.yaml index 40b3a28fcf..74354b58c2 100644 --- a/deployment/database/redis-container-puppet.yaml +++ b/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: '' diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index df468127d0..485aedcd26 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/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: '' diff --git a/deployment/deprecated/cavium/liquidio-compute-config-container-puppet.yaml b/deployment/deprecated/cavium/liquidio-compute-config-container-puppet.yaml index 544a729725..87ee29662a 100644 --- a/deployment/deprecated/cavium/liquidio-compute-config-container-puppet.yaml +++ b/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: '' diff --git a/deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml b/deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml index c119a23abd..fe709636a6 100644 --- a/deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml +++ b/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: '' diff --git a/deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml b/deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml index f458e4a3f4..d298e67cb4 100644 --- a/deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml +++ b/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: '' diff --git a/deployment/deprecated/mistral/mistral-api-container-puppet.yaml b/deployment/deprecated/mistral/mistral-api-container-puppet.yaml index 4e6e221e79..60c08d38b9 100644 --- a/deployment/deprecated/mistral/mistral-api-container-puppet.yaml +++ b/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: '' diff --git a/deployment/deprecated/mistral/mistral-base.yaml b/deployment/deprecated/mistral/mistral-base.yaml index a96152939b..2f4eb4c4c5 100644 --- a/deployment/deprecated/mistral/mistral-base.yaml +++ b/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: '' diff --git a/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml b/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml index b9cbed75ce..a967e2bada 100644 --- a/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml +++ b/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: '' diff --git a/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml b/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml index 2efb457be8..705ae1dfae 100644 --- a/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml +++ b/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: '' diff --git a/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml b/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml index 97327575ec..0bf5f701b3 100644 --- a/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml +++ b/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: '' diff --git a/deployment/deprecated/multipathd-container.yaml b/deployment/deprecated/multipathd-container.yaml index 5835f80896..bb29e59474 100644 --- a/deployment/deprecated/multipathd-container.yaml +++ b/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: '' diff --git a/deployment/deprecated/novajoin/ipaclient-baremetal-ansible.yaml b/deployment/deprecated/novajoin/ipaclient-baremetal-ansible.yaml index c6bf569005..47dbfc5566 100644 --- a/deployment/deprecated/novajoin/ipaclient-baremetal-ansible.yaml +++ b/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: '' diff --git a/deployment/deprecated/novajoin/novajoin-container-puppet.yaml b/deployment/deprecated/novajoin/novajoin-container-puppet.yaml index 12f6e62d74..5521ae668c 100644 --- a/deployment/deprecated/novajoin/novajoin-container-puppet.yaml +++ b/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: {} diff --git a/deployment/deprecated/zaqar/zaqar-container-puppet.yaml b/deployment/deprecated/zaqar/zaqar-container-puppet.yaml index 6758915035..dfac1a921f 100644 --- a/deployment/deprecated/zaqar/zaqar-container-puppet.yaml +++ b/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: '' diff --git a/deployment/etcd/etcd-container-puppet.yaml b/deployment/etcd/etcd-container-puppet.yaml index 55a5fb10cc..5b9afdda41 100644 --- a/deployment/etcd/etcd-container-puppet.yaml +++ b/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: '' diff --git a/deployment/experimental/designate/designate-api-container-puppet.yaml b/deployment/experimental/designate/designate-api-container-puppet.yaml index 86fb6daa13..f87f7cecc7 100644 --- a/deployment/experimental/designate/designate-api-container-puppet.yaml +++ b/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 RoleName: default: '' diff --git a/deployment/experimental/designate/designate-base.yaml b/deployment/experimental/designate/designate-base.yaml index ca58f5f30d..91fa034166 100644 --- a/deployment/experimental/designate/designate-base.yaml +++ b/deployment/experimental/designate/designate-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: '' diff --git a/deployment/experimental/designate/designate-bind-container.yaml b/deployment/experimental/designate/designate-bind-container.yaml index 294e0a3a1f..fe15fb9b18 100644 --- a/deployment/experimental/designate/designate-bind-container.yaml +++ b/deployment/experimental/designate/designate-bind-container.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: '' diff --git a/deployment/experimental/designate/designate-central-container-puppet.yaml b/deployment/experimental/designate/designate-central-container-puppet.yaml index 14d43eaf09..b0b8a97975 100644 --- a/deployment/experimental/designate/designate-central-container-puppet.yaml +++ b/deployment/experimental/designate/designate-central-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 EnableSQLAlchemyCollectd: type: boolean diff --git a/deployment/experimental/designate/designate-mdns-container-puppet.yaml b/deployment/experimental/designate/designate-mdns-container-puppet.yaml index e71ecc9bc2..9b45f2b49e 100644 --- a/deployment/experimental/designate/designate-mdns-container-puppet.yaml +++ b/deployment/experimental/designate/designate-mdns-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 EnableSQLAlchemyCollectd: type: boolean diff --git a/deployment/experimental/designate/designate-producer-container-puppet.yaml b/deployment/experimental/designate/designate-producer-container-puppet.yaml index a84e560752..b6c8a03208 100644 --- a/deployment/experimental/designate/designate-producer-container-puppet.yaml +++ b/deployment/experimental/designate/designate-producer-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: '' diff --git a/deployment/experimental/designate/designate-sink-container-puppet.yaml b/deployment/experimental/designate/designate-sink-container-puppet.yaml index 9c5d85b577..345357cf2b 100644 --- a/deployment/experimental/designate/designate-sink-container-puppet.yaml +++ b/deployment/experimental/designate/designate-sink-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: '' diff --git a/deployment/experimental/designate/designate-worker-container-puppet.yaml b/deployment/experimental/designate/designate-worker-container-puppet.yaml index 4dd3aeeca6..35d7fae704 100644 --- a/deployment/experimental/designate/designate-worker-container-puppet.yaml +++ b/deployment/experimental/designate/designate-worker-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: '' diff --git a/deployment/frr/frr-container-ansible.yaml b/deployment/frr/frr-container-ansible.yaml index d061208130..7b07ca83ae 100644 --- a/deployment/frr/frr-container-ansible.yaml +++ b/deployment/frr/frr-container-ansible.yaml @@ -19,8 +19,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: '' diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 3725008ee9..9a718e33e8 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-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: '' diff --git a/deployment/glance/glance-api-edge-container-puppet.yaml b/deployment/glance/glance-api-edge-container-puppet.yaml index 5dfe1f6028..c3285cf3e4 100644 --- a/deployment/glance/glance-api-edge-container-puppet.yaml +++ b/deployment/glance/glance-api-edge-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: '' diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index 8493a40c46..e7320b34e6 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-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: '' diff --git a/deployment/gnocchi/gnocchi-base.yaml b/deployment/gnocchi/gnocchi-base.yaml index b00fea39a6..877f9adf88 100644 --- a/deployment/gnocchi/gnocchi-base.yaml +++ b/deployment/gnocchi/gnocchi-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: '' diff --git a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml index 624d487108..a1d67b7b07 100644 --- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-metricd-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: '' diff --git a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml index c3f46df687..c40b260a65 100644 --- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-statsd-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: '' diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml index 7a0d84c024..4ebce5770c 100644 --- a/deployment/haproxy/haproxy-container-puppet.yaml +++ b/deployment/haproxy/haproxy-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 EndpointMap: default: {} diff --git a/deployment/haproxy/haproxy-edge-container-puppet.yaml b/deployment/haproxy/haproxy-edge-container-puppet.yaml index 2c548eb967..b9a86e7026 100644 --- a/deployment/haproxy/haproxy-edge-container-puppet.yaml +++ b/deployment/haproxy/haproxy-edge-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: '' diff --git a/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml b/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml index ce25db9071..5761b5ae98 100644 --- a/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml +++ b/deployment/haproxy/haproxy-internal-tls-certmonger.j2.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: '' diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index f5c229ffb5..c1672426f5 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-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 EndpointMap: default: {} diff --git a/deployment/haproxy/haproxy-public-tls-certmonger.yaml b/deployment/haproxy/haproxy-public-tls-certmonger.yaml index 1b895c6aff..97444c5fa1 100644 --- a/deployment/haproxy/haproxy-public-tls-certmonger.yaml +++ b/deployment/haproxy/haproxy-public-tls-certmonger.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: '' diff --git a/deployment/haproxy/haproxy-public-tls-inject.yaml b/deployment/haproxy/haproxy-public-tls-inject.yaml index ded4b2abc2..191a8c3079 100644 --- a/deployment/haproxy/haproxy-public-tls-inject.yaml +++ b/deployment/haproxy/haproxy-public-tls-inject.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: '' diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index a8c328e78b..72f612c6bf 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/deployment/heat/heat-api-cfn-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 RoleName: default: '' diff --git a/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml b/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml index 8a318aebe6..a680bafc08 100644 --- a/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml +++ b/deployment/heat/heat-api-cloudwatch-disabled-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: '' diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index 6a59b9f579..de09c148fc 100644 --- a/deployment/heat/heat-api-container-puppet.yaml +++ b/deployment/heat/heat-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 RoleName: default: '' diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml index 68324c9188..651cbfafc0 100644 --- a/deployment/heat/heat-base-puppet.yaml +++ b/deployment/heat/heat-base-puppet.yaml @@ -19,8 +19,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 HeatPassword: description: The password for the Heat service and db account, used by the Heat services. diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml index 7221d2a4ba..fb232ff873 100644 --- a/deployment/heat/heat-engine-container-puppet.yaml +++ b/deployment/heat/heat-engine-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: '' diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index 3a505964a7..756084317e 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/deployment/horizon/horizon-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: '' diff --git a/deployment/image-serve/image-serve-baremetal-ansible.yaml b/deployment/image-serve/image-serve-baremetal-ansible.yaml index 91c166b0e7..7655d03796 100644 --- a/deployment/image-serve/image-serve-baremetal-ansible.yaml +++ b/deployment/image-serve/image-serve-baremetal-ansible.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: '' diff --git a/deployment/ipa/ipaservices-baremetal-ansible.yaml b/deployment/ipa/ipaservices-baremetal-ansible.yaml index ba52d303be..3005c46bf6 100644 --- a/deployment/ipa/ipaservices-baremetal-ansible.yaml +++ b/deployment/ipa/ipaservices-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: '' diff --git a/deployment/ipsec/ipsec-baremetal-ansible.yaml b/deployment/ipsec/ipsec-baremetal-ansible.yaml index 0373189cf4..25c97df59e 100644 --- a/deployment/ipsec/ipsec-baremetal-ansible.yaml +++ b/deployment/ipsec/ipsec-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: '' diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index 8c5ce81e1b..ede7f96fbc 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-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: '' diff --git a/deployment/ironic/ironic-base-puppet.yaml b/deployment/ironic/ironic-base-puppet.yaml index bb54027501..0e410f07f9 100644 --- a/deployment/ironic/ironic-base-puppet.yaml +++ b/deployment/ironic/ironic-base-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: '' diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index 28c1158558..784e51ff23 100644 --- a/deployment/ironic/ironic-conductor-container-puppet.yaml +++ b/deployment/ironic/ironic-conductor-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 Debug: default: false diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml index 4ee70d3df2..7c580c5ce5 100644 --- a/deployment/ironic/ironic-inspector-container-puppet.yaml +++ b/deployment/ironic/ironic-inspector-container-puppet.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 ServiceData: default: {} diff --git a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml index 7b666e1379..ab29e972d7 100644 --- a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml +++ b/deployment/ironic/ironic-neutron-agent-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: '' diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml index ce3ec2b51f..ec8fd26958 100644 --- a/deployment/ironic/ironic-pxe-container-puppet.yaml +++ b/deployment/ironic/ironic-pxe-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: '' diff --git a/deployment/iscsid/iscsid-container-puppet.yaml b/deployment/iscsid/iscsid-container-puppet.yaml index a250e248e4..b2661428b9 100644 --- a/deployment/iscsid/iscsid-container-puppet.yaml +++ b/deployment/iscsid/iscsid-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: '' diff --git a/deployment/kernel/kernel-baremetal-ansible.yaml b/deployment/kernel/kernel-baremetal-ansible.yaml index 9addbeb764..4b9d241732 100644 --- a/deployment/kernel/kernel-baremetal-ansible.yaml +++ b/deployment/kernel/kernel-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 RoleName: default: '' diff --git a/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml b/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml index fe7c1fa1c2..2b18122128 100644 --- a/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml +++ b/deployment/kernel/kernel-boot-params-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: '' diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index ae57e6b26d..f992453c34 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-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: '' diff --git a/deployment/logging/rsyslog-baremetal-ansible.yaml b/deployment/logging/rsyslog-baremetal-ansible.yaml index 442bbfe2b2..1bad3b88ca 100644 --- a/deployment/logging/rsyslog-baremetal-ansible.yaml +++ b/deployment/logging/rsyslog-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 RoleName: default: '' diff --git a/deployment/logging/rsyslog-container-puppet.yaml b/deployment/logging/rsyslog-container-puppet.yaml index cf44fc8a3e..45f3ea147e 100644 --- a/deployment/logging/rsyslog-container-puppet.yaml +++ b/deployment/logging/rsyslog-container-puppet.yaml @@ -23,8 +23,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: '' diff --git a/deployment/logging/rsyslog-sidecar-container-puppet.yaml b/deployment/logging/rsyslog-sidecar-container-puppet.yaml index 539bac8b7e..ebe3714c42 100644 --- a/deployment/logging/rsyslog-sidecar-container-puppet.yaml +++ b/deployment/logging/rsyslog-sidecar-container-puppet.yaml @@ -19,8 +19,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: '' diff --git a/deployment/login-defs/login-defs-baremetal-ansible.yaml b/deployment/login-defs/login-defs-baremetal-ansible.yaml index e1e4d9799c..bbd6230c39 100644 --- a/deployment/login-defs/login-defs-baremetal-ansible.yaml +++ b/deployment/login-defs/login-defs-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 RoleName: default: '' diff --git a/deployment/logrotate/logrotate-crond-container-puppet.yaml b/deployment/logrotate/logrotate-crond-container-puppet.yaml index afaaf09a60..a151338196 100644 --- a/deployment/logrotate/logrotate-crond-container-puppet.yaml +++ b/deployment/logrotate/logrotate-crond-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: '' diff --git a/deployment/logrotate/tmpwatch-install.yaml b/deployment/logrotate/tmpwatch-install.yaml index ca3d3bb803..5d6bf57b1e 100644 --- a/deployment/logrotate/tmpwatch-install.yaml +++ b/deployment/logrotate/tmpwatch-install.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: '' diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index 88ccbb92d5..cef9a6c42e 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-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: '' diff --git a/deployment/manila/manila-backend-cephfs.yaml b/deployment/manila/manila-backend-cephfs.yaml index 749942ec3b..477eb66f7e 100644 --- a/deployment/manila/manila-backend-cephfs.yaml +++ b/deployment/manila/manila-backend-cephfs.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: '' diff --git a/deployment/manila/manila-backend-isilon.yaml b/deployment/manila/manila-backend-isilon.yaml index 13d2113fad..934bbae9a8 100644 --- a/deployment/manila/manila-backend-isilon.yaml +++ b/deployment/manila/manila-backend-isilon.yaml @@ -35,8 +35,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: '' diff --git a/deployment/manila/manila-backend-netapp.yaml b/deployment/manila/manila-backend-netapp.yaml index 3f4320b29c..ac32b958e9 100644 --- a/deployment/manila/manila-backend-netapp.yaml +++ b/deployment/manila/manila-backend-netapp.yaml @@ -71,8 +71,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: '' diff --git a/deployment/manila/manila-backend-unity.yaml b/deployment/manila/manila-backend-unity.yaml index c7182875f5..622c8f28b0 100644 --- a/deployment/manila/manila-backend-unity.yaml +++ b/deployment/manila/manila-backend-unity.yaml @@ -45,8 +45,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: '' diff --git a/deployment/manila/manila-backend-vmax.yaml b/deployment/manila/manila-backend-vmax.yaml index 54990a172e..eba4dd999c 100644 --- a/deployment/manila/manila-backend-vmax.yaml +++ b/deployment/manila/manila-backend-vmax.yaml @@ -35,8 +35,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: '' diff --git a/deployment/manila/manila-backend-vnx.yaml b/deployment/manila/manila-backend-vnx.yaml index 54dc0f6f54..6d8196161b 100644 --- a/deployment/manila/manila-backend-vnx.yaml +++ b/deployment/manila/manila-backend-vnx.yaml @@ -45,8 +45,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: '' diff --git a/deployment/manila/manila-base.yaml b/deployment/manila/manila-base.yaml index 0da86d3844..42c4c46375 100644 --- a/deployment/manila/manila-base.yaml +++ b/deployment/manila/manila-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: '' diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml index 91f7009416..c6e6e1fa5c 100644 --- a/deployment/manila/manila-scheduler-container-puppet.yaml +++ b/deployment/manila/manila-scheduler-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: '' diff --git a/deployment/manila/manila-share-common.yaml b/deployment/manila/manila-share-common.yaml index 730ccabdb5..8d28ff4791 100644 --- a/deployment/manila/manila-share-common.yaml +++ b/deployment/manila/manila-share-common.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: '' diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml index 0827658e41..1708153dd5 100644 --- a/deployment/manila/manila-share-container-puppet.yaml +++ b/deployment/manila/manila-share-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: '' diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index 48b3840b9b..aeae921d3a 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/deployment/manila/manila-share-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: '' diff --git a/deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml b/deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml index 8a7a26e39b..f6cc07e313 100644 --- a/deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml +++ b/deployment/masquerade-networks/masquerade-networks-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: '' diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml index 715aa6dbae..e680caa20d 100644 --- a/deployment/memcached/memcached-container-puppet.yaml +++ b/deployment/memcached/memcached-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: '' diff --git a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml index b9b68ca9ad..6e5b4d4188 100644 --- a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml +++ b/deployment/messaging/rpc-qdrouterd-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: '' diff --git a/deployment/metrics/collectd-container-ansible.yaml b/deployment/metrics/collectd-container-ansible.yaml index 872feb3cf3..44a654280d 100644 --- a/deployment/metrics/collectd-container-ansible.yaml +++ b/deployment/metrics/collectd-container-ansible.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 DefaultPasswords: default: {} diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml index 9f0312fe38..40d09f2cd1 100644 --- a/deployment/metrics/collectd-container-puppet.yaml +++ b/deployment/metrics/collectd-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: '' diff --git a/deployment/metrics/qdr-container-ansible.yaml b/deployment/metrics/qdr-container-ansible.yaml index 99d3054969..75e648eef6 100644 --- a/deployment/metrics/qdr-container-ansible.yaml +++ b/deployment/metrics/qdr-container-ansible.yaml @@ -131,8 +131,9 @@ parameters: type: json ServiceNetMap: default: {} - description: Mapping of service_name -> network name. Typically set via parameter_defaults - in the resource registry. This mapping overrides those in ServiceNetMapDefaults. + description: Mapping of service_name -> network name. Typically set + via parameter_defaults in the resource registry. Use + parameter_merge_strategies to merge it with the defaults. type: json ############################################################################## diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml index c95084d89f..3e94d39e6c 100644 --- a/deployment/metrics/qdr-container-puppet.yaml +++ b/deployment/metrics/qdr-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: '' diff --git a/deployment/multipathd/multipathd-container-ansible.yaml b/deployment/multipathd/multipathd-container-ansible.yaml index 8febd185fc..9ecc440836 100644 --- a/deployment/multipathd/multipathd-container-ansible.yaml +++ b/deployment/multipathd/multipathd-container-ansible.yaml @@ -49,8 +49,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: '' diff --git a/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml b/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml index 4d3270ac8a..3631d307bb 100644 --- a/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml +++ b/deployment/neutron/neutron-agents-ib-config-container-puppet.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: '' diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index 24be5c445c..0aefaaa82e 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/deployment/neutron/neutron-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: '' diff --git a/deployment/neutron/neutron-base.yaml b/deployment/neutron/neutron-base.yaml index 2f74ce5180..51811d9ad6 100644 --- a/deployment/neutron/neutron-base.yaml +++ b/deployment/neutron/neutron-base.yaml @@ -80,8 +80,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: '' diff --git a/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml b/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml index 29f69a9c5b..cda6c45a03 100644 --- a/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml +++ b/deployment/neutron/neutron-bgpvpn-api-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: '' diff --git a/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml b/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml index 8c301de65b..18b9e4b854 100644 --- a/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml @@ -35,8 +35,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: '' diff --git a/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml index 0210b21abb..c5effccc56 100644 --- a/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-bigswitch-agent-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: '' diff --git a/deployment/neutron/neutron-compute-plugin-nuage.yaml b/deployment/neutron/neutron-compute-plugin-nuage.yaml index 62f202bfca..e630f9695d 100644 --- a/deployment/neutron/neutron-compute-plugin-nuage.yaml +++ b/deployment/neutron/neutron-compute-plugin-nuage.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: '' diff --git a/deployment/neutron/neutron-controller-plugin-nuage.yaml b/deployment/neutron/neutron-controller-plugin-nuage.yaml index 0f08fd7ff4..564168b773 100644 --- a/deployment/neutron/neutron-controller-plugin-nuage.yaml +++ b/deployment/neutron/neutron-controller-plugin-nuage.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: '' diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml index 200a4cfaaa..cb532c6c46 100644 --- a/deployment/neutron/neutron-dhcp-container-puppet.yaml +++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml @@ -59,8 +59,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: '' diff --git a/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml index b144df7653..c43e9b5499 100644 --- a/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-l2gw-agent-baremetal-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 Debug: type: boolean diff --git a/deployment/neutron/neutron-l2gw-api-container-puppet.yaml b/deployment/neutron/neutron-l2gw-api-container-puppet.yaml index b6884a673a..9b2cec937e 100644 --- a/deployment/neutron/neutron-l2gw-api-container-puppet.yaml +++ b/deployment/neutron/neutron-l2gw-api-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: '' diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml index f3ba8003c8..c22af947f0 100644 --- a/deployment/neutron/neutron-l3-container-puppet.yaml +++ b/deployment/neutron/neutron-l3-container-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: '' diff --git a/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml index 7a63a1e088..d62099ee33 100644 --- a/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-linuxbridge-agent-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 EndpointMap: default: {} diff --git a/deployment/neutron/neutron-metadata-container-puppet.yaml b/deployment/neutron/neutron-metadata-container-puppet.yaml index 5d89131116..d483fc6a67 100644 --- a/deployment/neutron/neutron-metadata-container-puppet.yaml +++ b/deployment/neutron/neutron-metadata-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 EndpointMap: default: {} diff --git a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml index a33b1694e4..2ce1de170d 100644 --- a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-mlnx-agent-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: '' diff --git a/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml b/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml index ecaeb1d2e9..5fe23664b5 100644 --- a/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml +++ b/deployment/neutron/neutron-ovn-dpdk-config-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: '' diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml index 1b14a549d9..0d984ad219 100644 --- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-ovs-agent-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: '' diff --git a/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml index 3470b7bf76..8cc42d6382 100644 --- a/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.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: '' diff --git a/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml index c49db8ebb5..cac80e2df1 100644 --- a/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-ansible-container-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 ContainerNeutronConfigImage: description: The container image to use for the neutron config_volume diff --git a/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml index 2f5a397b3d..738e6d20fe 100644 --- a/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-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 ContainerNeutronConfigImage: description: The container image to use for the neutron config_volume diff --git a/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml index d1d08a6d78..3cb2e5237d 100644 --- a/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-container-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 ContainerNeutronConfigImage: description: The container image to use for the neutron config_volume diff --git a/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml index 5a1326c9d7..ea1b22d837 100644 --- a/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-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: '' diff --git a/deployment/neutron/neutron-plugin-ml2-nuage.yaml b/deployment/neutron/neutron-plugin-ml2-nuage.yaml index e057200d4a..fccfa002ef 100644 --- a/deployment/neutron/neutron-plugin-ml2-nuage.yaml +++ b/deployment/neutron/neutron-plugin-ml2-nuage.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: '' diff --git a/deployment/neutron/neutron-plugin-ml2-ovn.yaml b/deployment/neutron/neutron-plugin-ml2-ovn.yaml index d1c1d65e19..41c82d7234 100644 --- a/deployment/neutron/neutron-plugin-ml2-ovn.yaml +++ b/deployment/neutron/neutron-plugin-ml2-ovn.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: '' diff --git a/deployment/neutron/neutron-plugin-ml2.yaml b/deployment/neutron/neutron-plugin-ml2.yaml index 786c37bf97..ff6fba1170 100644 --- a/deployment/neutron/neutron-plugin-ml2.yaml +++ b/deployment/neutron/neutron-plugin-ml2.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: '' diff --git a/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml b/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml index 72cb659f63..6aa070db04 100644 --- a/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-nsx-container-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 ContainerNeutronConfigImage: description: The container image to use for the neutron config_volume diff --git a/deployment/neutron/neutron-plugin-nuage.yaml b/deployment/neutron/neutron-plugin-nuage.yaml index ea08620926..e9a66c692e 100644 --- a/deployment/neutron/neutron-plugin-nuage.yaml +++ b/deployment/neutron/neutron-plugin-nuage.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: '' diff --git a/deployment/neutron/neutron-sfc-api-container-puppet.yaml b/deployment/neutron/neutron-sfc-api-container-puppet.yaml index 9834284dcc..8c136799db 100644 --- a/deployment/neutron/neutron-sfc-api-container-puppet.yaml +++ b/deployment/neutron/neutron-sfc-api-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: '' diff --git a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml index 65be17d45b..4778985cb2 100644 --- a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-sriov-agent-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: '' diff --git a/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml index 3a8bf6fdbe..59684f9b81 100644 --- a/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml @@ -10,10 +10,9 @@ parameters: type: json ServiceNetMap: default: {} - description: > - Mapping of service_name -> network name. Typically set via - parameter_defaults in the resource registry. This mapping overrides those - in ServiceNetMapDefaults. + description: Mapping of service_name -> network name. Typically set + via parameter_defaults in the resource registry. Use + parameter_merge_strategies to merge it with the defaults. type: json RoleName: default: '' diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index 929638ebd3..a0b3dcd11e 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/deployment/nova/nova-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: '' diff --git a/deployment/nova/nova-apidb-client-puppet.yaml b/deployment/nova/nova-apidb-client-puppet.yaml index e127cae520..be01ef5114 100644 --- a/deployment/nova/nova-apidb-client-puppet.yaml +++ b/deployment/nova/nova-apidb-client-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: '' diff --git a/deployment/nova/nova-az-config.yaml b/deployment/nova/nova-az-config.yaml index 69d61e83f9..c078e0263c 100644 --- a/deployment/nova/nova-az-config.yaml +++ b/deployment/nova/nova-az-config.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: '' diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml index 358cfec941..87175bdbf4 100644 --- a/deployment/nova/nova-base-puppet.yaml +++ b/deployment/nova/nova-base-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: '' diff --git a/deployment/nova/nova-compute-common-container-puppet.yaml b/deployment/nova/nova-compute-common-container-puppet.yaml index c170ff0cd9..7a57802d41 100644 --- a/deployment/nova/nova-compute-common-container-puppet.yaml +++ b/deployment/nova/nova-compute-common-container-puppet.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: '' diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index 8ba85aadf1..f0b7583e13 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-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: '' diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml index eae55dac9c..053d7f62b4 100644 --- a/deployment/nova/nova-conductor-container-puppet.yaml +++ b/deployment/nova/nova-conductor-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: '' diff --git a/deployment/nova/nova-db-client-puppet.yaml b/deployment/nova/nova-db-client-puppet.yaml index 79a978e831..e4665e7e77 100644 --- a/deployment/nova/nova-db-client-puppet.yaml +++ b/deployment/nova/nova-db-client-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: '' diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml index 910eb5169b..1814c81d1e 100644 --- a/deployment/nova/nova-ironic-container-puppet.yaml +++ b/deployment/nova/nova-ironic-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: '' diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml index ffbf7d8623..8ef1d90246 100644 --- a/deployment/nova/nova-libvirt-container-puppet.yaml +++ b/deployment/nova/nova-libvirt-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 RoleName: default: '' diff --git a/deployment/nova/nova-libvirt-guests-container-puppet.yaml b/deployment/nova/nova-libvirt-guests-container-puppet.yaml index be66f75c90..2934f7dfbd 100644 --- a/deployment/nova/nova-libvirt-guests-container-puppet.yaml +++ b/deployment/nova/nova-libvirt-guests-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 EndpointMap: default: {} diff --git a/deployment/nova/nova-manager-container-puppet.yaml b/deployment/nova/nova-manager-container-puppet.yaml index 24faf07474..a033b673dd 100644 --- a/deployment/nova/nova-manager-container-puppet.yaml +++ b/deployment/nova/nova-manager-container-puppet.yaml @@ -19,8 +19,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: '' diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index 73050b3e76..6c7d6eb7e0 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-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: '' diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml index 19f186999e..cd460fc13e 100644 --- a/deployment/nova/nova-migration-target-container-puppet.yaml +++ b/deployment/nova/nova-migration-target-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: '' diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml index e313891932..f40bae8153 100644 --- a/deployment/nova/nova-scheduler-container-puppet.yaml +++ b/deployment/nova/nova-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: '' diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml index 6e211beaa4..287e90cc9c 100644 --- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml +++ b/deployment/nova/nova-vnc-proxy-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: '' diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml index 0fccdf2aa5..6ec76e8ce8 100644 --- a/deployment/octavia/octavia-api-container-puppet.yaml +++ b/deployment/octavia/octavia-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: '' diff --git a/deployment/octavia/octavia-base.yaml b/deployment/octavia/octavia-base.yaml index a5a7bb3149..cb7c26ff19 100644 --- a/deployment/octavia/octavia-base.yaml +++ b/deployment/octavia/octavia-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: '' diff --git a/deployment/octavia/octavia-deployment-config.j2.yaml b/deployment/octavia/octavia-deployment-config.j2.yaml index 6947c6b615..dde825f1c6 100644 --- a/deployment/octavia/octavia-deployment-config.j2.yaml +++ b/deployment/octavia/octavia-deployment-config.j2.yaml @@ -15,8 +15,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: '' diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index 7de27f06d7..545edb0360 100644 --- a/deployment/octavia/octavia-health-manager-container-puppet.yaml +++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml @@ -30,8 +30,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: '' diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml index d7e578edb9..aecc839dee 100644 --- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml +++ b/deployment/octavia/octavia-housekeeping-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: '' diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml index 20eb1fffe3..bcf4314c83 100644 --- a/deployment/octavia/octavia-worker-container-puppet.yaml +++ b/deployment/octavia/octavia-worker-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: '' diff --git a/deployment/octavia/providers/ovn-provider-config.yaml b/deployment/octavia/providers/ovn-provider-config.yaml index 88ef1ee2cd..c1ea8619e6 100644 --- a/deployment/octavia/providers/ovn-provider-config.yaml +++ b/deployment/octavia/providers/ovn-provider-config.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: '' diff --git a/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml b/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml index 81658a3fb3..b0c3b913a1 100644 --- a/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml +++ b/deployment/openvswitch/openvswitch-dpdk-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 RoleName: default: '' diff --git a/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml b/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml index 91ee52c818..0b5882fdc2 100644 --- a/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml +++ b/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-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 RoleName: default: '' diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml index f807b3684a..cbca5ce7ab 100644 --- a/deployment/ovn/ovn-controller-container-puppet.yaml +++ b/deployment/ovn/ovn-controller-container-puppet.yaml @@ -15,8 +15,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: {} diff --git a/deployment/ovn/ovn-dbs-container-puppet.yaml b/deployment/ovn/ovn-dbs-container-puppet.yaml index c86aae62f0..22670ad2cb 100644 --- a/deployment/ovn/ovn-dbs-container-puppet.yaml +++ b/deployment/ovn/ovn-dbs-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 RoleName: default: '' diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index 164852cab1..082757a877 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/deployment/ovn/ovn-dbs-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: '' diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml index 0a855126de..a498b9d867 100644 --- a/deployment/ovn/ovn-metadata-container-puppet.yaml +++ b/deployment/ovn/ovn-metadata-container-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 EndpointMap: default: {} diff --git a/deployment/pacemaker/clustercheck-container-puppet.yaml b/deployment/pacemaker/clustercheck-container-puppet.yaml index a10f4984f1..a58d272ba5 100644 --- a/deployment/pacemaker/clustercheck-container-puppet.yaml +++ b/deployment/pacemaker/clustercheck-container-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: '' diff --git a/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml b/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml index 89e9849d8a..5d75c08516 100644 --- a/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml +++ b/deployment/pacemaker/compute-instanceha-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: '' diff --git a/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml b/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml index 108a8840dc..1fe89d6afc 100644 --- a/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml +++ b/deployment/pacemaker/ovn-dbs-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: '' diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml index 0ffb4e38b3..9b30fe7639 100644 --- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml +++ b/deployment/pacemaker/pacemaker-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: '' diff --git a/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml index 419585f2f9..22cd6f488e 100644 --- a/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml +++ b/deployment/pacemaker/pacemaker-remote-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: '' diff --git a/deployment/placement/placement-api-container-puppet.yaml b/deployment/placement/placement-api-container-puppet.yaml index 07c04c4628..7c0437ec36 100644 --- a/deployment/placement/placement-api-container-puppet.yaml +++ b/deployment/placement/placement-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 EnableSQLAlchemyCollectd: type: boolean diff --git a/deployment/podman/podman-baremetal-ansible.yaml b/deployment/podman/podman-baremetal-ansible.yaml index 1cd2aa606c..37e67b4cce 100644 --- a/deployment/podman/podman-baremetal-ansible.yaml +++ b/deployment/podman/podman-baremetal-ansible.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: '' diff --git a/deployment/qdr/qdrouterd-container-puppet.yaml b/deployment/qdr/qdrouterd-container-puppet.yaml index aec6dde51b..ce8c618fd4 100644 --- a/deployment/qdr/qdrouterd-container-puppet.yaml +++ b/deployment/qdr/qdrouterd-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: '' diff --git a/deployment/rabbitmq/rabbitmq-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml index ea0c0ab7f6..14964c9798 100644 --- a/deployment/rabbitmq/rabbitmq-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-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: '' diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml index 6515268491..758113d643 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-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: '' diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 64f36eef58..c09caee1e2 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-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 RabbitCookie: type: string diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml index 3458ba3817..3d9383d804 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-shared-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: '' diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index 615173ab83..2457ab7f82 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-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 RabbitCookie: type: string diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml index 17298357bd..a0848900f0 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-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: '' diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index 48aceb9306..2078e0f3e1 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-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 RabbitCookie: type: string diff --git a/deployment/rhsm/rhsm-baremetal-ansible.yaml b/deployment/rhsm/rhsm-baremetal-ansible.yaml index d5202805c3..61043e476f 100644 --- a/deployment/rhsm/rhsm-baremetal-ansible.yaml +++ b/deployment/rhsm/rhsm-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: '' diff --git a/deployment/securetty/securetty-baremetal-ansible.yaml b/deployment/securetty/securetty-baremetal-ansible.yaml index 7d95d71c32..8aab2bcc89 100644 --- a/deployment/securetty/securetty-baremetal-ansible.yaml +++ b/deployment/securetty/securetty-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 RoleName: default: '' diff --git a/deployment/snmp/snmp-baremetal-puppet.yaml b/deployment/snmp/snmp-baremetal-puppet.yaml index 2b4cc9347e..77d62a092a 100644 --- a/deployment/snmp/snmp-baremetal-puppet.yaml +++ b/deployment/snmp/snmp-baremetal-puppet.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: '' diff --git a/deployment/sshd/sshd-baremetal-ansible.yaml b/deployment/sshd/sshd-baremetal-ansible.yaml index 594079d07f..6279737dca 100644 --- a/deployment/sshd/sshd-baremetal-ansible.yaml +++ b/deployment/sshd/sshd-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 RoleName: default: '' diff --git a/deployment/sshd/sshd-baremetal-puppet.yaml b/deployment/sshd/sshd-baremetal-puppet.yaml index 3defb01cca..87548fbabf 100644 --- a/deployment/sshd/sshd-baremetal-puppet.yaml +++ b/deployment/sshd/sshd-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: '' diff --git a/deployment/swift/external-swift-proxy-baremetal-puppet.yaml b/deployment/swift/external-swift-proxy-baremetal-puppet.yaml index 8abc9a02eb..dc185066ef 100644 --- a/deployment/swift/external-swift-proxy-baremetal-puppet.yaml +++ b/deployment/swift/external-swift-proxy-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: '' diff --git a/deployment/swift/swift-base.yaml b/deployment/swift/swift-base.yaml index 30bb47f01a..672571f990 100644 --- a/deployment/swift/swift-base.yaml +++ b/deployment/swift/swift-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: '' diff --git a/deployment/swift/swift-dispersion-baremetal-puppet.yaml b/deployment/swift/swift-dispersion-baremetal-puppet.yaml index 45060a6d76..6f54f8243b 100644 --- a/deployment/swift/swift-dispersion-baremetal-puppet.yaml +++ b/deployment/swift/swift-dispersion-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: '' diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index ac5fadb8b7..bf77b67807 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/deployment/swift/swift-proxy-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: '' diff --git a/deployment/swift/swift-ringbuilder-container-puppet.yaml b/deployment/swift/swift-ringbuilder-container-puppet.yaml index f257527ff9..538ce7fd6c 100644 --- a/deployment/swift/swift-ringbuilder-container-puppet.yaml +++ b/deployment/swift/swift-ringbuilder-container-puppet.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: '' diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml index 6643ecf97b..81f285e57d 100644 --- a/deployment/swift/swift-storage-container-puppet.yaml +++ b/deployment/swift/swift-storage-container-puppet.yaml @@ -39,8 +39,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 SwiftRawDisks: default: {} diff --git a/deployment/tests/test-container-volume.yaml b/deployment/tests/test-container-volume.yaml index 639accc8b8..16b4444d2f 100644 --- a/deployment/tests/test-container-volume.yaml +++ b/deployment/tests/test-container-volume.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: '' diff --git a/deployment/time/ptp-baremetal-ansible.yaml b/deployment/time/ptp-baremetal-ansible.yaml index 3a256ea114..3280b41ddf 100644 --- a/deployment/time/ptp-baremetal-ansible.yaml +++ b/deployment/time/ptp-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 RoleName: default: '' diff --git a/deployment/time/timezone-baremetal-ansible.yaml b/deployment/time/timezone-baremetal-ansible.yaml index a3202852b4..6ee374ee27 100644 --- a/deployment/time/timezone-baremetal-ansible.yaml +++ b/deployment/time/timezone-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 RoleName: default: '' diff --git a/deployment/timemaster/timemaster-baremetal-ansible.yaml b/deployment/timemaster/timemaster-baremetal-ansible.yaml index 7cddad6540..4e7482d6c0 100644 --- a/deployment/timemaster/timemaster-baremetal-ansible.yaml +++ b/deployment/timemaster/timemaster-baremetal-ansible.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 DefaultPasswords: default: {} diff --git a/deployment/timesync/chrony-baremetal-ansible.yaml b/deployment/timesync/chrony-baremetal-ansible.yaml index 428050c430..399c8e2452 100644 --- a/deployment/timesync/chrony-baremetal-ansible.yaml +++ b/deployment/timesync/chrony-baremetal-ansible.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: '' diff --git a/deployment/tls/undercloud-remove-novajoin.yaml b/deployment/tls/undercloud-remove-novajoin.yaml index a94790b8bc..c840ac0461 100644 --- a/deployment/tls/undercloud-remove-novajoin.yaml +++ b/deployment/tls/undercloud-remove-novajoin.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: '' diff --git a/deployment/tls/undercloud-tls.yaml b/deployment/tls/undercloud-tls.yaml index 9114598d49..68b564b5da 100644 --- a/deployment/tls/undercloud-tls.yaml +++ b/deployment/tls/undercloud-tls.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: '' diff --git a/deployment/tripleo-firewall/tripleo-firewall-baremetal-ansible.yaml b/deployment/tripleo-firewall/tripleo-firewall-baremetal-ansible.yaml index e5f571eb16..87d3f05e04 100644 --- a/deployment/tripleo-firewall/tripleo-firewall-baremetal-ansible.yaml +++ b/deployment/tripleo-firewall/tripleo-firewall-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 RoleName: default: '' diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml index c985eb1fd6..a2d8e6dda4 100644 --- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml +++ b/deployment/tripleo-packages/tripleo-packages-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: '' diff --git a/deployment/tuned/tuned-baremetal-ansible.yaml b/deployment/tuned/tuned-baremetal-ansible.yaml index 2cea8dda48..171ebcb970 100644 --- a/deployment/tuned/tuned-baremetal-ansible.yaml +++ b/deployment/tuned/tuned-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: {} diff --git a/deployment/unbound/unbound-container-ansible.yaml b/deployment/unbound/unbound-container-ansible.yaml index 6cd77786b9..6258f7312d 100644 --- a/deployment/unbound/unbound-container-ansible.yaml +++ b/deployment/unbound/unbound-container-ansible.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: '' diff --git a/deployment/undercloud/minion-rabbitmq-puppet.yaml b/deployment/undercloud/minion-rabbitmq-puppet.yaml index d911995b44..7c93c5326d 100644 --- a/deployment/undercloud/minion-rabbitmq-puppet.yaml +++ b/deployment/undercloud/minion-rabbitmq-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: '' diff --git a/deployment/undercloud/undercloud-upgrade.yaml b/deployment/undercloud/undercloud-upgrade.yaml index 1e6a84be48..f55acf2609 100644 --- a/deployment/undercloud/undercloud-upgrade.yaml +++ b/deployment/undercloud/undercloud-upgrade.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: '' diff --git a/deployment/validations/tripleo-validations-baremetal-ansible.yaml b/deployment/validations/tripleo-validations-baremetal-ansible.yaml index 6d3aa3be7b..bc86ac1a51 100644 --- a/deployment/validations/tripleo-validations-baremetal-ansible.yaml +++ b/deployment/validations/tripleo-validations-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 RoleName: default: '' diff --git a/deployment/vpp/vpp-baremetal-puppet.yaml b/deployment/vpp/vpp-baremetal-puppet.yaml index 34788253e3..486446b917 100644 --- a/deployment/vpp/vpp-baremetal-puppet.yaml +++ b/deployment/vpp/vpp-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: '' diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index cd817dff5a..bcd3387322 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -1,11 +1,3 @@ -{% set _service_nets = {} %} -{% for network in networks if network.enabled|default(true) %} -{% if network.service_net_map_replace is defined %} -{% set _ = _service_nets.update({network.service_net_map_replace:network.name_lower}) %} -{% else %} -{% set _ = _service_nets.update({network.name_lower:network.name_lower}) %} -{% endif %} -{% endfor %} heat_template_version: wallaby description: > @@ -14,107 +6,13 @@ description: > parameters: ServiceNetMap: 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. Note that the key in this map must match the service_name in the service template, e.g if the service_name is heat_api the key must be either heat_api_network, or optionally HeatApiNetwork (which will be internally converted to transform captalization to underscores). - default: {} - type: json - - # Note that the key in this map must match the service_name - # see the description above about conversion from CamelCase to - # snake_case - the names must still match when converted - ServiceNetMapDefaults: - default: - # Note the values in this map are replaced by *NetName - # to allow for sane defaults when the network names are - # overridden. - ApacheNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - NeutronTenantNetwork: {{ _service_nets.get('tenant', 'ctlplane') }} - AodhApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - BarbicanApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - GnocchiApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - MongodbNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - CinderApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - CinderIscsiNetwork: {{ _service_nets.get('storage', 'ctlplane') }} - GlanceApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - GlanceApiEdgeNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - IronicApiNetwork: ctlplane - IronicNetwork: ctlplane - IronicInspectorNetwork: ctlplane - KeystoneAdminApiNetwork: ctlplane # allows undercloud to config endpoints - KeystonePublicApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - ManilaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - NeutronApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - OctaviaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - HeatApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - HeatApiCfnNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - HeatApiCloudwatchNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - NovaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - PlacementNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - NovaMetadataNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - NovaVncProxyNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - NovaLibvirtNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - NovajoinNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - SwiftStorageNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }} - SwiftProxyNetwork: {{ _service_nets.get('storage', 'ctlplane') }} - HorizonNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - MemcachedNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - OsloMessagingRpcNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - OsloMessagingNotifyNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - RabbitmqNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - RabbitmqManagementNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - QdrNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - RedisNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - GaneshaNetwork: {{ _service_nets.get('storage_nfs', 'ctlplane') }} - MysqlNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - SnmpdNetwork: ctlplane - CephClusterNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }} - CephDashboardNetwork: {{ _service_nets.get('storage', 'ctlplane') }} - CephGrafanaNetwork: {{ _service_nets.get('storage', 'ctlplane') }} - CephMonNetwork: {{ _service_nets.get('storage', 'ctlplane') }} - CephRgwNetwork: {{ _service_nets.get('storage', 'ctlplane') }} - PublicNetwork: {{ _service_nets.get('external', 'ctlplane') }} - OpendaylightApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - OvnDbsNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - MistralApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - ZaqarApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - DockerRegistryNetwork: ctlplane - PacemakerNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - PacemakerRemoteNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - DesignateApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - BINDNetwork: {{ _service_nets.get('external', 'ctlplane') }} - EtcdNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - # HaproxyNetwork currently only controls the haproxy.stats network binding - HaproxyNetwork: ctlplane - UnboundNetwork: {{ _service_nets.get('external', 'ctlplane') }} - # We special-case the default ResolveNetwork and MetricsQdrNetwork for the Ceph roles - # for backwards compatibility, all other roles default to internal_api -{%- for role in roles %} - {%- if 'ceph' in role.tags|default([]) %} - {%- if 'Storage' in role.networks %} - {{role.name}}HostnameResolveNetwork: {{ _service_nets.get('storage', 'ctlplane') }} - {{role.name}}MetricsQdrNetwork: {{ _service_nets.get('storage', 'ctlplane') }} - {%- else %} - {{role.name}}HostnameResolveNetwork: ctlplane - {{role.name}}MetricsQdrNetwork: ctlplane - {%- endif %} - {%- else %} - {%- if 'InternalApi' in role.networks %} - {{role.name}}HostnameResolveNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - {{role.name}}MetricsQdrNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - {%- else %} - {{role.name}}HostnameResolveNetwork: ctlplane - {{role.name}}MetricsQdrNetwork: ctlplane - {%- endif %} - {%- endif %} -{%- endfor %} - - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. type: json ControlPlaneSubnet: @@ -124,18 +22,8 @@ parameters: VipSubnetMap: description: Map of (network_name or service_name) -> subnet_name that - defines which subnet to host the VIP. - default: {} - type: json - - VipSubnetMapDefaults: - default: - ctlplane: ctlplane-subnet -{%- for network in networks if network.vip|default(false) %} - {{network.name}}: {{network.name_lower}}_subnet -{%- endfor %} - redis: internal_api_subnet - ovn_dbs: internal_api_subnet + defines which subnet to host the VIP. Use + parameter_merge_strategies to merge it with the defaults. type: json # We define mappings to work around names that break when doing the @@ -168,30 +56,13 @@ resources: properties: type: json value: - map_merge: - - map_replace: - - {get_param: ServiceNetMapDefaults} - - values: + map_replace: + - {get_param: ServiceNetMap} + - values: {%- for network in networks if network.enabled|default(true) %} - {{network.name_lower}}: {get_param: {{network.name}}NetName} + {{network.name_lower}}: {get_param: {{network.name}}NetName} {%- endfor %} - - map_replace: - - {get_param: ServiceNetMap} - - keys: {get_param: ServiceNetMapDeprecatedMapping} - - VipSubnetMapValue: - type: OS::Heat::Value - properties: - type: json - value: - map_merge: - # (hjensas): We need to map_replace the ctlplane-subnet to support - # legacy parameter ControlPlaneSubnet. - - map_replace: - - {get_param: VipSubnetMapDefaults} - - values: - ctlplane-subnet: {get_param: ControlPlaneSubnet} - - {get_param: VipSubnetMap} + keys: {get_param: ServiceNetMapDeprecatedMapping} outputs: service_net_map: @@ -208,4 +79,10 @@ outputs: map: {get_attr: [ServiceNetMapValue, value]} vip_subnet_map: - value: {get_attr: [VipSubnetMapValue, value]} + value: + # (hjensas): We need to map_replace the ctlplane-subnet to support + # legacy parameter ControlPlaneSubnet. + map_replace: + - {get_param: VipSubnetMap} + - values: + ctlplane-subnet: {get_param: ControlPlaneSubnet} diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index a3450cd7f1..d03de9c190 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -1,3 +1,11 @@ +{% set _service_nets = {} %} +{% for network in networks if network.enabled|default(true) %} +{% if network.service_net_map_replace is defined %} +{% set _ = _service_nets.update({network.service_net_map_replace:network.name_lower}) %} +{% else %} +{% set _ = _service_nets.update({network.name_lower:network.name_lower}) %} +{% endif %} +{% endfor %} resource_registry: OS::TripleO::SoftwareDeployment: config-download-structured.yaml @@ -340,6 +348,10 @@ resource_registry: OS::TripleO::Services::BootParams: deployment/kernel/kernel-boot-params-baremetal-ansible.yaml +parameter_merge_strategies: + ServiceNetMap: merge + VipSubnetMap: merge + parameter_defaults: NeutronMechanismDrivers: ovn ContainerCli: podman @@ -352,3 +364,93 @@ parameter_defaults: {{role.name}}Services: {{role.ServicesDefault|default([])}} {{role.name}}NetworkDeploymentActions: [] {% endfor %} + + ServiceNetMap: + ApacheNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + NeutronTenantNetwork: {{ _service_nets.get('tenant', 'ctlplane') }} + AodhApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + BarbicanApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + GnocchiApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + MongodbNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + CinderApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + CinderIscsiNetwork: {{ _service_nets.get('storage', 'ctlplane') }} + GlanceApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + GlanceApiEdgeNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + IronicApiNetwork: ctlplane + IronicNetwork: ctlplane + IronicInspectorNetwork: ctlplane + KeystoneAdminApiNetwork: ctlplane # allows undercloud to config endpoints + KeystonePublicApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + ManilaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + NeutronApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + OctaviaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + HeatApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + HeatApiCfnNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + HeatApiCloudwatchNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + NovaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + PlacementNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + NovaVncProxyNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + NovaMetadataNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + NovaLibvirtNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + NovajoinNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + SwiftStorageNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }} + SwiftProxyNetwork: {{ _service_nets.get('storage', 'ctlplane') }} + HorizonNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + MemcachedNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + OsloMessagingRpcNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + OsloMessagingNotifyNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + RabbitmqNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + RabbitmqManagementNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + QdrNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + RedisNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + GaneshaNetwork: {{ _service_nets.get('storage_nfs', 'ctlplane') }} + MysqlNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + SnmpdNetwork: ctlplane + CephClusterNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }} + CephDashboardNetwork: {{ _service_nets.get('storage', 'ctlplane') }} + CephGrafanaNetwork: {{ _service_nets.get('storage', 'ctlplane') }} + CephMonNetwork: {{ _service_nets.get('storage', 'ctlplane') }} + CephRgwNetwork: {{ _service_nets.get('storage', 'ctlplane') }} + PublicNetwork: {{ _service_nets.get('external', 'ctlplane') }} + OpendaylightApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + OvnDbsNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + MistralApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + ZaqarApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + DockerRegistryNetwork: ctlplane + PacemakerNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + PacemakerRemoteNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + DesignateApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + BINDNetwork: {{ _service_nets.get('external', 'ctlplane') }} + EtcdNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + # HaproxyNetwork currently only controls the haproxy.stats network binding + HaproxyNetwork: ctlplane + UnboundNetwork: {{ _service_nets.get('external', 'ctlplane') }} + # We special-case the default ResolveNetwork and MetricsQdrNetwork for the Ceph roles + # for backwards compatibility, all other roles default to internal_api + {%- for role in roles %} + {%- if 'ceph' in role.tags|default([]) %} + {%- if 'Storage' in role.networks %} + {{role.name}}HostnameResolveNetwork: {{ _service_nets.get('storage', 'ctlplane') }} + {{role.name}}MetricsQdrNetwork: {{ _service_nets.get('storage', 'ctlplane') }} + {%- else %} + {{role.name}}HostnameResolveNetwork: ctlplane + {{role.name}}MetricsQdrNetwork: ctlplane + {%- endif %} + {%- else %} + {%- if 'InternalApi' in role.networks %} + {{role.name}}HostnameResolveNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + {{role.name}}MetricsQdrNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} + {%- else %} + {{role.name}}HostnameResolveNetwork: ctlplane + {{role.name}}MetricsQdrNetwork: ctlplane + {%- endif %} + {%- endif %} + {%- endfor %} + + VipSubnetMap: + ctlplane: ctlplane-subnet +{%- for network in networks if network.vip|default(false) %} + {{network.name}}: {{network.name_lower}}_subnet +{%- endfor %} + redis: internal_api_subnet + ovn_dbs: internal_api_subnet diff --git a/releasenotes/notes/use-server-side-merging-service-net-map-0c65b5e421ce05bd.yaml b/releasenotes/notes/use-server-side-merging-service-net-map-0c65b5e421ce05bd.yaml new file mode 100644 index 0000000000..d070b9a948 --- /dev/null +++ b/releasenotes/notes/use-server-side-merging-service-net-map-0c65b5e421ce05bd.yaml @@ -0,0 +1,12 @@ +--- +features: + - | + This changes the ServiceNetMap and VipSubnetMap interfaces to allow for + server side env merging. This would, for example, allow for adding network + for a new services without having to specify complete ServiceNetMap in + parameter_defaults section of an environment file. +upgrade: + - | + With the change to ServiceNetMap/VipSubnetMap interface, existing environments + where they are overridden have to specify 'merge' strategy for the parameters + in a new 'parameter_merge_strategies' section.