Skip to content

Commit 075c42a

Browse files
authored
Merge pull request #80692 from aireilly/remove-amqp-TELCODOCS-1862
TELCODOCS-1862 - remove EOL AMQP docs for 4.17
2 parents 8084804 + 7cbc0ee commit 075c42a

26 files changed

+41
-262
lines changed

edge_computing/policygenerator_for_ztp/ztp-advanced-policygenerator-config.adoc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@ include::modules/ztp-provisioning-lvm-storage.adoc[leveloffset=+1]
6969
[id="ztp-advanced-policy-config-ptp_{context}"]
7070
== Configuring PTP events with {policy-gen-cr} CRs
7171

72-
You can use the {ztp} pipeline to configure PTP events that use HTTP or AMQP transport.
73-
74-
include::snippets/ptp-amq-interconnect-eol.adoc[]
72+
You can use the {ztp} pipeline to configure PTP events that use HTTP transport.
7573

7674
include::modules/ztp-configuring-ptp-fast-events.adoc[leveloffset=+2]
7775

@@ -80,13 +78,9 @@ include::modules/ztp-configuring-ptp-fast-events.adoc[leveloffset=+2]
8078

8179
* xref:../../edge_computing/policygenerator_for_ztp/ztp-advanced-policygenerator-config.adoc#ztp-using-pgt-to-update-source-crs_ztp-advanced-policygenerator-config[Using {policy-gen-cr} CRs to override source CRs content]
8280

83-
include::modules/ztp-configuring-ptp-fast-events-amqp.adoc[leveloffset=+2]
84-
8581
[role="_additional-resources"]
8682
.Additional resources
8783

88-
* xref:../../networking/ptp/using-ptp-events.adoc#cnf-installing-amq-interconnect-messaging-bus_using-ptp-events[Installing the AMQ messaging bus]
89-
9084
* xref:../../registry/index.adoc#registry-overview[{product-registry} overview]
9185

9286
include::modules/ztp-add-local-reg-for-sno-duprofile.adoc[leveloffset=+1]

edge_computing/policygentemplate_for_ztp/ztp-advanced-policy-config.adoc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ include::modules/ztp-provisioning-lvm-storage.adoc[leveloffset=+1]
6565
[id="ztp-advanced-policy-config-ptp_{context}"]
6666
== Configuring PTP events with PolicyGenTemplate CRs
6767

68-
You can use the {ztp} pipeline to configure PTP events that use HTTP or AMQP transport.
69-
70-
include::snippets/ptp-amq-interconnect-eol.adoc[]
68+
You can use the {ztp} pipeline to configure PTP events that use HTTP transport.
7169

7270
include::modules/ztp-configuring-ptp-fast-events.adoc[leveloffset=+2]
7371

@@ -76,13 +74,9 @@ include::modules/ztp-configuring-ptp-fast-events.adoc[leveloffset=+2]
7674

7775
* xref:../../edge_computing/policygentemplate_for_ztp/ztp-advanced-policy-config.adoc#ztp-using-pgt-to-update-source-crs_ztp-advanced-policy-config[Using PolicyGenTemplate CRs to override source CRs content]
7876

79-
include::modules/ztp-configuring-ptp-fast-events-amqp.adoc[leveloffset=+2]
80-
8177
[role="_additional-resources"]
8278
.Additional resources
8379

84-
* xref:../../networking/ptp/using-ptp-events.adoc#cnf-installing-amq-interconnect-messaging-bus_using-ptp-events[Installing the AMQ messaging bus]
85-
8680
* xref:../../registry/index.adoc#registry-overview[{product-registry} overview]
8781

8882
include::modules/ztp-add-local-reg-for-sno-duprofile.adoc[leveloffset=+1]

modules/cnf-about-ptp-and-clock-synchronization.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ Loss of PTP synchronization is a critical error for a RAN network. If synchroniz
1010

1111
Event notifications are available to vRAN applications running on the same DU node. A publish/subscribe REST API passes events notifications to the messaging bus. Publish/subscribe messaging, or pub-sub messaging, is an asynchronous service-to-service communication architecture where any message published to a topic is immediately received by all of the subscribers to the topic.
1212

13-
The PTP Operator generates fast event notifications for every PTP-capable network interface. You can access the events by using a `cloud-event-proxy` sidecar container over an HTTP or Advanced Message Queuing Protocol (AMQP) message bus.
13+
The PTP Operator generates fast event notifications for every PTP-capable network interface. You can access the events by using a `cloud-event-proxy` sidecar container over an HTTP message bus.
1414

1515
[NOTE]
1616
====
1717
PTP fast event notifications are available for network interfaces configured to use PTP ordinary clocks, PTP grandmaster clocks, or PTP boundary clocks.
1818
====
19-
20-
include::snippets/ptp-amq-interconnect-eol.adoc[]

modules/cnf-about-ptp-fast-event-notifications-framework.adoc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ Use the Precision Time Protocol (PTP) fast event notifications framework to subs
1313
The fast events notifications framework uses a REST API for communication. The REST API is based on the _O-RAN O-Cloud Notification API Specification for Event Consumers 3.0_ that is available from link:https://orandownloadsweb.azurewebsites.net/specifications[O-RAN ALLIANCE Specifications].
1414
====
1515

16-
The framework consists of a publisher, subscriber, and an AMQ or HTTP messaging protocol to handle communications between the publisher and subscriber applications.
16+
The framework consists of a publisher, subscriber, and an HTTP messaging protocol to handle communications between the publisher and subscriber applications.
1717
Applications run the `cloud-event-proxy` container in a sidecar pattern to subscribe to PTP events.
1818
The `cloud-event-proxy` sidecar container can access the same resources as the primary application container without using any of the resources of the primary application and with no significant latency.
1919

20-
include::snippets/ptp-amq-interconnect-eol.adoc[]
21-
2220
.Overview of PTP fast events
2321
image::319_OpenShift_PTP_bare-metal_OCP_nodes_0323_4.13.png[Overview of PTP fast events]
2422

@@ -34,14 +32,14 @@ image:darkcircle-3.png[20,20] Event is persisted::
3432
The `cloud-event-proxy` sidecar in the PTP Operator-managed pod processes the event and publishes the cloud-native event by using a REST API.
3533

3634
image:darkcircle-4.png[20,20] Message is transported::
37-
The message transporter transports the event to the `cloud-event-proxy` sidecar in the application pod over HTTP or AMQP 1.0 QPID.
35+
The message transporter transports the event to the `cloud-event-proxy` sidecar in the application pod over HTTP.
3836

3937
image:darkcircle-5.png[20,20] Event is available from the REST API::
4038
The `cloud-event-proxy` sidecar in the Application pod processes the event and makes it available by using the REST API.
4139

4240
image:darkcircle-6.png[20,20] Consumer application requests a subscription and receives the subscribed event::
4341
The consumer application sends an API request to the `cloud-event-proxy` sidecar in the application pod to create a PTP events subscription.
44-
The `cloud-event-proxy` sidecar creates an AMQ or HTTP messaging listener protocol for the resource specified in the subscription.
42+
The `cloud-event-proxy` sidecar creates an HTTP messaging listener protocol for the resource specified in the subscription.
4543

4644
The `cloud-event-proxy` sidecar in the application pod receives the event from the PTP Operator-managed pod, unwraps the cloud events object to retrieve the data, and posts the event to the consumer application.
4745
The consumer application listens to the address specified in the resource qualifier and receives and processes the PTP event.

modules/cnf-configuring-the-ptp-fast-event-publisher.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ spec:
4141
[NOTE]
4242
====
4343
In {product-title} 4.13 or later, you do not need to set the `spec.ptpEventConfig.transportHost` field in the `PtpOperatorConfig` resource when you use HTTP transport for PTP events.
44-
Set `transportHost` only when you use AMQP transport for PTP events.
4544
====
4645

4746
.. Update the `PtpOperatorConfig` CR:

modules/cnf-installing-amq-interconnect-messaging-bus.adoc

Lines changed: 0 additions & 52 deletions
This file was deleted.

modules/ptp-reference-deployment-and-service-crs.adoc

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
Use the following example `cloud-event-proxy` deployment and subscriber service CRs as a reference when deploying your PTP events consumer application.
1010

11-
include::snippets/ptp-amq-interconnect-eol.adoc[]
12-
1311
.Reference cloud-event-proxy deployment with HTTP transport
1412
[source,yaml]
1513
----
@@ -64,57 +62,6 @@ spec:
6462
emptyDir: {}
6563
----
6664

67-
.Reference cloud-event-proxy deployment with AMQ transport
68-
[source,yaml]
69-
----
70-
apiVersion: apps/v1
71-
kind: Deployment
72-
metadata:
73-
name: cloud-event-proxy-sidecar
74-
namespace: cloud-events
75-
labels:
76-
app: cloud-event-proxy
77-
spec:
78-
selector:
79-
matchLabels:
80-
app: cloud-event-proxy
81-
template:
82-
metadata:
83-
labels:
84-
app: cloud-event-proxy
85-
spec:
86-
nodeSelector:
87-
node-role.kubernetes.io/worker: ""
88-
containers:
89-
- name: cloud-event-sidecar
90-
image: openshift4/ose-cloud-event-proxy
91-
args:
92-
- "--metrics-addr=127.0.0.1:9091"
93-
- "--store-path=/store"
94-
- "--transport-host=amqp://router.router.svc.cluster.local"
95-
- "--api-port=8089"
96-
env:
97-
- name: <node_name>
98-
valueFrom:
99-
fieldRef:
100-
fieldPath: spec.nodeName
101-
- name: <node_ip>
102-
valueFrom:
103-
fieldRef:
104-
fieldPath: status.hostIP
105-
volumeMounts:
106-
- name: pubsubstore
107-
mountPath: /store
108-
ports:
109-
- name: metrics-port
110-
containerPort: 9091
111-
- name: sub-port
112-
containerPort: 9043
113-
volumes:
114-
- name: pubsubstore
115-
emptyDir: {}
116-
----
117-
11865
.Reference cloud-event-proxy subscriber service
11966
[source,yaml]
12067
----

modules/ztp-add-local-reg-for-sno-duprofile.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Module included in the following assemblies:
22
//
3-
// * edge_computing/ztp-advanced-policy-config.adoc
4-
// * edge_computing/ztp-advanced-policygenerator-config.adoc
3+
// * edge_computing/policygenerator_for_ztp/ztp-advanced-policygenerator-config.adoc
4+
// * edge_computing/policygentemplate_for_ztp/ztp-advanced-policy-config.adoc
55

66
:_module-type: CONCEPT
77
[id="ztp-add-local-reg-for-sno-duprofile_{context}"]

modules/ztp-adding-new-content-to-gitops-ztp.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Module included in the following assemblies:
22
//
3-
// * edge_computing/ztp-advanced-policy-config.adoc
4-
// * edge_computing/ztp-advanced-policygenerator-config.adoc
3+
// * edge_computing/policygenerator_for_ztp/ztp-advanced-policygenerator-config.adoc
4+
// * edge_computing/policygentemplate_for_ztp/ztp-advanced-policy-config.adoc
55

66
:_mod-docs-content-type: PROCEDURE
77

modules/ztp-configuring-disk-partitioning.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Module included in the following assemblies:
22
//
3-
// * edge_computing/ztp-advanced-policy-config.adoc
4-
// * edge_computing/ztp-advanced-policygenerator-config.adoc
3+
// * edge_computing/policygenerator_for_ztp/ztp-advanced-policygenerator-config.adoc
4+
// * edge_computing/policygentemplate_for_ztp/ztp-advanced-policy-config.adoc
55

66
:_module-type: PROCEDURE
77
[id="ztp-configuring-disk-partitioning_{context}"]
@@ -63,7 +63,7 @@ $ butane storage.bu
6363
----
6464
--
6565

66-
. Use a tool such as link:https://jsonformatter.org/json-pretty-print[JSON Pretty Print] to convert the output into JSON format.
66+
. Use a tool such as link:https://jsonformatter.org/json-pretty-print[JSON Pretty Print] to convert the output into JSON format.
6767

6868
. Copy the output into the `.spec.clusters.nodes.ignitionConfigOverride` field in the `SiteConfig` CR.
6969
+
@@ -115,13 +115,13 @@ spec:
115115
}
116116
]
117117
}
118-
}
118+
}
119119
[...]
120120
----
121121
+
122122
[NOTE]
123123
====
124-
If the `.spec.clusters.nodes.ignitionConfigOverride` field does not exist, create it.
124+
If the `.spec.clusters.nodes.ignitionConfigOverride` field does not exist, create it.
125125
====
126126

127127
.Verification
@@ -141,7 +141,7 @@ $ oc get bmh -n my-sno-ns my-sno -ojson | jq '.metadata.annotations["bmac.agent-
141141
----
142142
--
143143
144-
. After installation, check the {sno} disk status.
144+
. After installation, check the {sno} disk status.
145145
146146
.. Enter into a debug session on the {sno} node by running the following command. This step instantiates a debug pod called `<node_name>-debug`:
147147
+
@@ -200,4 +200,4 @@ tmpfs 126G 4.0K 126G 1% /tmp
200200
/dev/sda5 203G 119G 85G 59% /var/lib/containers
201201
/dev/sda3 350M 110M 218M 34% /boot
202202
tmpfs 26G 0 26G 0% /run/user/1000
203-
----
203+
----

modules/ztp-configuring-pgt-compliance-eval-timeouts.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Module included in the following assemblies:
22
//
3-
// * edge_computing/ztp-advanced-policy-config.adoc
4-
// * edge_computing/ztp-advanced-policygenerator-config.adoc
3+
// * edge_computing/policygenerator_for_ztp/ztp-advanced-policygenerator-config.adoc
4+
// * edge_computing/policygentemplate_for_ztp/ztp-advanced-policy-config.adoc
55

66
:_mod-docs-content-type: PROCEDURE
77
[id="ztp-configuring-pgt-compliance-eval-timeouts_{context}"]

modules/ztp-configuring-pgt-image-registry.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Module included in the following assemblies:
22
//
3-
// * edge_computing/ztp-advanced-policy-config.adoc
4-
// * edge_computing/ztp-advanced-policygenerator-config.adoc
3+
// * edge_computing/policygenerator_for_ztp/ztp-advanced-policygenerator-config.adoc
4+
// * edge_computing/policygentemplate_for_ztp/ztp-advanced-policy-config.adoc
55

66
:_module-type: PROCEDURE
77
[id="ztp-configuring-pgt-image-registry_{context}"]

modules/ztp-configuring-ptp-fast-events-amqp.adoc

Lines changed: 0 additions & 76 deletions
This file was deleted.

modules/ztp-configuring-ptp-fast-events.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Module included in the following assemblies:
22
//
3-
// * edge_computing/ztp-advanced-policy-config.adoc
4-
// * edge_computing/ztp-advanced-policygenerator-config.adoc
3+
// * edge_computing/policygenerator_for_ztp/ztp-advanced-policygenerator-config.adoc
4+
// * edge_computing/policygentemplate_for_ztp/ztp-advanced-policy-config.adoc
55

66
:_mod-docs-content-type: PROCEDURE
77
[id="ztp-configuring-ptp-fast-events_{context}"]

0 commit comments

Comments
 (0)