Skip to content

Commit 7c4d9bd

Browse files
authored
Merge pull request #28995 from andymcc/bz1920839
BZ#1920839 Fix variable expansion in logging docs
2 parents 3b48148 + 4d3c271 commit 7c4d9bd

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

modules/cluster-logging-systemd-scaling.adoc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,13 @@ For more information on systemd settings, see link:https://www.freedesktop.org/s
7575
$ export jrnl_cnf=$( cat /journald.conf | base64 -w0 )
7676
----
7777

78-
. Create a new `MachineConfig` object for master or worker and add the `journal.conf` parameters:
78+
. Create a `MachineConfig` object that includes the `jrnl_cnf` variable, which is the encoded contents of the `journald.conf` you created in the previous step.
7979
+
8080
For example:
8181
+
82-
[source,yaml]
82+
[source,terminal]
8383
----
84+
$ cat > /tmp/40-worker-custom-journald.yaml <<EOF
8485
apiVersion: machineconfiguration.openshift.io/v1
8586
kind: MachineConfig
8687
metadata:
@@ -98,15 +99,16 @@ spec:
9899
mode: 0644 <1>
99100
overwrite: true
100101
path: /etc/systemd/journald.conf <2>
102+
EOF
101103
----
102104
<1> Set the permissions for the `journal.conf` file. It is recommended to set `0644` permissions.
103105
<2> Specify the path to the base64-encoded `journal.conf` file.
104106

105-
. Create the machine config:
107+
. Create the machine config. For example:
106108
+
107109
[source,terminal]
108110
----
109-
$ oc apply -f <filename>.yaml
111+
$ oc apply -f /tmp/40-worker-custom-journald.yaml
110112
----
111113
+
112114
The controller detects the new `MachineConfig` object and generates a new `rendered-worker-<hash>` version.

0 commit comments

Comments
 (0)