From 64145cbe4559a3951602458c2446c3222a48809f Mon Sep 17 00:00:00 2001
From: Leif Madsen <lmadsen@redhat.com>
Date: Thu, 15 Jul 2021 10:41:30 -0400
Subject: [PATCH 1/2] Allow better build controls in Makefile (#250)

When building all, build both the html and html13 documents.
Add a new 'downstream' option so you can build for downstream testing as well.

Cherry picked from commit 62470aea3e813b1a660e6599abd6deaec91b3642
---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d486c81c..dea0d9b2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@ all: html
 
 html: all-html
 
+downstream: all-html-downstream
+
 pdf: all-pdf
 
 clean: all-clean
@@ -9,7 +11,10 @@ clean: all-clean
 browser: all-browser
 
 all-html:
-	cd doc-Service-Telemetry-Framework && $(MAKE) html
+	cd doc-Service-Telemetry-Framework && $(MAKE) html && $(MAKE) html13
+
+all-html-downstream:
+	cd doc-Service-Telemetry-Framework && $(MAKE) html BUILD=downstream && $(MAKE) html13 BUILD=downstream
 
 all-pdf:
 	cd doc-Service-Telemetry-Framework && $(MAKE) pdf

From f1382a2471b76866c3be73397b7ed499d046e520 Mon Sep 17 00:00:00 2001
From: Leif Madsen <lmadsen@redhat.com>
Date: Thu, 15 Jul 2021 10:50:27 -0400
Subject: [PATCH 2/2] Fix issue with building OSP13

Fix an issue with building OSP13 documentation that was found by
actually building the OSP13 documentation in our testing :)
---
 ...c_creating-openstack-environment-file.adoc | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file.adoc b/doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file.adoc
index 8529b1e9..64798cdb 100644
--- a/doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file.adoc
+++ b/doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file.adoc
@@ -168,9 +168,9 @@ parameter_defaults:
         cloud1-telemetry:     # <4>
             format: JSON
             presettle: true
-    CollectdEnableSensubility: true # <7>
+    CollectdEnableSensubility: true # <6>
     CollectdSensubilityTransport: amqp1
-    CollectdSensubilityResultsChannel: collectd/cloud1-notify # <5>
+    CollectdSensubilityResultsChannel: collectd/cloud1-notify # <7>
 
     MetricsQdrAddresses:
         - prefix: collectd
@@ -180,14 +180,9 @@ parameter_defaults:
 
     MetricsQdrSSLProfiles:
         - name: sslProfile
-ifdef::include_when_13[]
-          caCertFileContent: |
-            ----BEGIN CERTIFICATE----
-            <snip>
-            ----END CERTIFICATE----
-endif::include_when_13[]
+
     MetricsQdrConnectors:
-        - host: stf-default-interconnect-5671-service-telemetry.apps.infra.watch   # <6>
+        - host: stf-default-interconnect-5671-service-telemetry.apps.infra.watch   # <5>
           port: 443
           role: edge
           verifyHostname: false
@@ -199,9 +194,11 @@ endif::include_when_16[]
 <2> Define the topic for Ceilometer metrics. This value is the address format of `anycast/ceilometer/cloud1-metering.sample`.
 <3> Define the topic for collectd events. This value is the format of `collectd/cloud1-notify`.
 <4> Define the topic for collectd metrics. This value is the format of `collectd/cloud1-telemetry`.
-<5> Define the topic for collectd-sensubility events. This should be the exact string format of `collectd/cloud1-notify`
-<6> Adjust the `MetricsQdrConnectors` host to the address of the {ProjectShort} route.
-<7> Enable monitoring of health and API status.
+<5> Adjust the `MetricsQdrConnectors` host to the address of the {ProjectShort} route.
+ifdef::include_when_16[]
+<6> Enable monitoring of health and API status.
+<7> Define the topic for collectd-sensubility events. This should be the exact string format of `collectd/cloud1-notify`
+endif::include_when_16[]
 +
 . Ensure that the naming convention in the `stf-connectors.yaml` file aligns with the `spec.amqpUrl` field in the Smart Gateway configuration. For example, configure the `CeilometerQdrEventsConfig.topic` field to a value of `cloud1-event`.