Skip to content

Commit 7c56756

Browse files
aireillyobrown1205
authored andcommitted
adding ptp configuring > using redirect
OCPBUGS#2005: Correct dataset_comparison in PTP Ordinary Clock Configuration adding support check mark/link for RHV in UPI on Restricted Network Updated cluster-logging-loki.adoc Aligned YAML lokistack_CRfix removed prefix spaces line 133 lokistack_CRfix vector as item under collection
1 parent 5e1b638 commit 7c56756

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

.s2i/httpd-cfg/01-commercial.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,9 @@ AddType text/vtt vtt
579579
RewriteRule ^dedicated/support/summarizing-cluster-specifications.html /dedicated/osd_support/osd-summarizing-cluster-specifications.html [NE,R=301]
580580
RewriteRule ^dedicated/support/?(.*)$ /dedicated/osd_support/$1 [NE,R=301]
581581

582+
# Redirects for PTP changes delivered in https://github.com/openshift/openshift-docs/pull/35889
583+
RewriteRule ^container-platform/(4\.9|4\.10|4\.11)/networking/configuring-ptp.html /container-platform/$1/networking/using-ptp.html [NE,R=302]
584+
582585
# OCP specific redirects
583586
RewriteRule ^(container-platform|enterprise)/(3\.2|3\.3|3\.4|3\.5|3\.6|3\.7)/architecture/additional_concepts/throttling\.html(.*)$ /$1/$2/admin_guide/overcommit.html$3 [NE,L,R=301]
584587
RewriteRule ^(container-platform|enterprise)/(.[^/])/admin_guide/install/(advanced_install|deploy_router|docker_registry|first_steps|overview|prerequisites|quick_install|upgrades)\.html(.*)$ /$1/$2/install/$3.html$4 [NE,R=301]

installing/installing-preparing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ ifndef::openshift-origin[]
503503
|xref:../installing/installing_gcp/installing-restricted-networks-gcp.adoc#installing-restricted-networks-gcp[✓]
504504
|
505505
|
506-
|
506+
|xref:../installing/installing_rhv/installing-rhv-restricted-network.adoc#installing-rhv-restricted-network[✓]
507507
|xref:../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[✓]
508508
|
509509
|xref:../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[✓]

modules/cluster-logging-loki-deploy.adoc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,16 @@ oc apply -f logging-loki.yaml
101101
apiVersion: logging.openshift.io/v1
102102
kind: ClusterLogging
103103
metadata:
104-
name: cr-lokistack
104+
name: instance
105105
namespace: openshift-logging
106106
spec:
107-
logStore:
107+
managementState: Managed
108+
logStore:
109+
type: lokistack
108110
lokistack:
109111
name: logging-loki
112+
collection:
113+
type: "vector"
110114
----
111115
+
112116
.. Apply the configuration:

modules/nw-ptp-configuring-linuxptp-services-as-ordinary-clock.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ spec:
5454
freq_est_interval 1
5555
dscp_event 0
5656
dscp_general 0
57-
dataset_comparison ieee1588
57+
dataset_comparison G.8275.x
5858
G.8275.defaultDS.localPriority 128
5959
#
6060
# Port Data Set

0 commit comments

Comments
 (0)