Merge branch 'master' into stf-1498/events-disabled-by-default

infrawatch · Sep 11, 2023 · b866da0 · b866da0
2 parents 5fe4b95 + b248a57
commit b866da0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/...ry-Framework/modules/proc_configuring-the-stf-connection-for-the-overcloud.adoc b/...ry-Framework/modules/proc_configuring-the-stf-connection-for-the-overcloud.adoc
@@ -32,6 +32,9 @@ resource_registry:
   OS::TripleO::Services::Collectd: /usr/share/openstack-tripleo-heat-templates/deployment/metrics/collectd-container-puppet.yaml
 
 parameter_defaults:
+    ExtraConfig:
+        qdr::router_id: "%{::hostname}.cloud1"
+
     MetricsQdrConnectors:
         - host: default-interconnect-5671-service-telemetry.apps.infra.watch
           port: 443
@@ -62,6 +65,7 @@ ifndef::include_when_13[]
 endif::[]
 ----
 
+* The `qdr::router_id` configuration is to override the default value which uses the fully-qualified domain name (FQDN) of the host. In some cases the FQDN can result in a router ID length of greater than 61 characters which results in failed QDR connections. For deployments with shorter FQDN values this is not necessary.
 * The `resource_registry` configuration directly loads the collectd service because you do not include the `collectd-write-qdr.yaml` environment file for multiple cloud deployments.
 * Replace the `host` parameter with the value that you retrieved in xref:retrieving-the-qdr-route-address_assembly-completing-the-stf-configuration[].
 ifdef::include_when_13,include_when_17[]

diff --git a/...ework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc b/...ework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc
@@ -61,6 +61,9 @@ resource_registry:
   OS::TripleO::Services::Collectd: /usr/share/openstack-tripleo-heat-templates/deployment/metrics/collectd-container-puppet.yaml
 
 parameter_defaults:
+    ExtraConfig:
+        qdr::router_id: %{::hostname}.cloud1
+
     MetricsQdrConnectors:
         - host: default-interconnect-5671-service-telemetry.apps.infra.watch
           port: 443
@@ -91,6 +94,7 @@ ifndef::include_when_13[]
 endif::[]
 ----
 +
+* The `qdr::router_id` configuration is to override the default value which uses the fully-qualified domain name (FQDN) of the host. In some cases the FQDN can result in a router ID length of greater than 61 characters which results in failed QDR connections. For deployments with shorter FQDN values this is not necessary.
 * The `resource_registry` configuration directly loads the collectd service because you do not include the `collectd-write-qdr.yaml` environment file for multiple cloud deployments.
 * Replace the `host` parameter with the value that you retrieved in xref:retrieving-the-qdr-route-address_assembly-completing-the-stf-configuration[].
 ifdef::include_when_13,include_when_17[]