Skip to content

Commit 1c8b75a

Browse files
authored
Add certificate steps to OSP17 (#395)
1 parent 910b4ff commit 1c8b75a

4 files changed

+15
-15
lines changed

doc-Service-Telemetry-Framework/assemblies/assembly_completing-the-stf-configuration.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ endif::include_when_13[]
2929

3030
// Basic overcloud deployment using default parameters
3131
include::../modules/proc_configuring-red-hat-openstack-platform-overcloud-for-stf.adoc[leveloffset=+1]
32-
ifdef::include_when_13[]
32+
ifdef::include_when_13,include_when_17[]
3333
include::../modules/proc_getting-ca-certificate-from-stf-for-overcloud-configuration.adoc[leveloffset=+2]
34-
endif::include_when_13[]
34+
endif::include_when_13,include_when_17[]
3535
include::../modules/proc_retrieving-the-qdr-route-address.adoc[leveloffset=+2]
3636
include::../modules/proc_creating-the-base-configuration-for-stf.adoc[leveloffset=+2]
3737
include::../modules/proc_configuring-the-stf-connection-for-the-overcloud.adoc[leveloffset=+2]

doc-Service-Telemetry-Framework/modules/proc_configuring-red-hat-openstack-platform-overcloud-for-stf.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ As part of the {OpenStack} ({OpenStackShort}) overcloud deployment, you must con
66

77
.Procedure
88

9-
ifdef::include_when_13[]
9+
ifdef::include_when_13,include_when_17[]
1010
. xref:getting-ca-certificate-from-stf-for-overcloud-configuration_assembly-completing-the-stf-configuration[]
11-
endif::include_when_13[]
11+
endif::include_when_13,include_when_17[]
1212
. xref:retrieving-the-qdr-route-address_assembly-completing-the-stf-configuration[Retrieving the {MessageBus} route address]
1313
. xref:creating-the-base-configuration-for-stf_assembly-completing-the-stf-configuration[Creating the base configuration for {ProjectShort}]
1414
. xref:configuring-the-stf-connection-for-the-overcloud_assembly-completing-the-stf-configuration[Configuring the {ProjectShort} connection for the overcloud]

doc-Service-Telemetry-Framework/modules/proc_configuring-the-stf-connection-for-the-overcloud.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ To configure the {Project} ({ProjectShort}) connection, you must create a file t
66

77
.Prerequisites
88

9-
ifdef::include_when_13[]
9+
ifdef::include_when_13,include_when_17[]
1010
* Retrieve the CA certificate from the {MessageBus} deployed by {ProjectShort}. For more information, see xref:getting-ca-certificate-from-stf-for-overcloud-configuration_assembly-completing-the-stf-configuration[].
11-
endif::include_when_13[]
11+
endif::include_when_13,include_when_17[]
1212
* Retrieve the {MessageBus} route address. For more information, see xref:retrieving-the-qdr-route-address_assembly-completing-the-stf-configuration[].
1313

1414
// The following configuration should match the contents in modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc. If you have changes to make, please make the same changes to both files.
@@ -22,9 +22,9 @@ endif::include_when_13[]
2222

2323
* Replace the `host` parameter with the value of `HOST/PORT` that you retrieved in xref:retrieving-the-qdr-route-address_assembly-completing-the-stf-configuration[].
2424

25-
ifdef::include_when_13[]
25+
ifdef::include_when_13,include_when_17[]
2626
* Replace the `caCertFileContent` parameter with the contents retrieved in xref:getting-ca-certificate-from-stf-for-overcloud-configuration_assembly-completing-the-stf-configuration[].
27-
endif::include_when_13[]
27+
endif::include_when_13,include_when_17[]
2828
+
2929
.stf-connectors.yaml
3030
[source,yaml,options="nowrap"]
@@ -42,12 +42,12 @@ parameter_defaults:
4242
4343
MetricsQdrSSLProfiles:
4444
- name: sslProfile
45-
ifdef::include_when_13[]
45+
ifdef::include_when_13,include_when_17[]
4646
caCertFileContent: |
4747
----BEGIN CERTIFICATE----
4848
<snip>
4949
----END CERTIFICATE----
50-
endif::include_when_13[]
50+
endif::include_when_13,include_when_17[]
5151
5252
CeilometerQdrEventsConfig:
5353
driver: amqp

doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ endif::include_when_16[]
3333

3434
.Prerequisites
3535

36-
ifdef::include_when_13[* You have retrieved the CA certificate from the {MessageBus} deployed by {ProjectShort}. For more information, see xref:getting-ca-certificate-from-stf-for-overcloud-configuration_assembly-completing-the-stf-configuration[].]
36+
ifdef::include_when_13,include_when_17[* You have retrieved the CA certificate from the {MessageBus} deployed by {ProjectShort}. For more information, see xref:getting-ca-certificate-from-stf-for-overcloud-configuration_assembly-completing-the-stf-configuration[].]
3737
* You have created your list of clouds objects. For more information about creating the content for the clouds parameter, see the xref:clouds_assembly-installing-the-core-components-of-stf[clouds configuration parameter].
3838
* You have retrieved the {MessageBus} route address. For more information, see xref:retrieving-the-qdr-route-address_assembly-completing-the-stf-configuration[].
3939
* You have created the base configuration for {ProjectShort}. For more information, see xref:creating-the-base-configuration-for-stf_assembly-completing-the-stf-configuration[].
@@ -52,10 +52,10 @@ ifdef::include_when_16[]
5252
. In the `stf-connectors.yaml` file, configure the `MetricsQdrConnectors` address to connect to the {MessageBus} on the overcloud deployment. Configure the `CeilometerQdrEventsConfig`, `CeilometerQdrMetricsConfig`, `CollectdAmqpInstances`, and `CollectdSensubilityResultsChannel` topic values to match the AMQP address that you want for this cloud deployment.
5353
endif::include_when_16[]
5454
+
55-
ifdef::include_when_13[]
55+
ifdef::include_when_13,include_when_17[]
5656
* Replace the `caCertFileContent` parameter with the contents retrieved in xref:getting-ca-certificate-from-stf-for-overcloud-configuration_assembly-completing-the-stf-configuration[].
5757
+
58-
endif::include_when_13[]
58+
endif::include_when_13,include_when_17[]
5959
// The following configuration should match the contents in modules/proc_configuring-the-stf-connection-for-the-overcloud.adoc. If you have changes to make, please make the same changes to both files.
6060
+
6161
.stf-connectors.yaml
@@ -74,12 +74,12 @@ parameter_defaults:
7474
7575
MetricsQdrSSLProfiles:
7676
- name: sslProfile
77-
ifdef::include_when_13[]
77+
ifdef::include_when_13,include_when_17[]
7878
caCertFileContent: |
7979
----BEGIN CERTIFICATE----
8080
<snip>
8181
----END CERTIFICATE----
82-
endif::include_when_13[]
82+
endif::include_when_13,include_when_17[]
8383
8484
CeilometerQdrEventsConfig:
8585
driver: amqp

0 commit comments

Comments
 (0)