Skip to content

Commit d896aa3

Browse files
authored
CASMINST-6503: Linting (#3907)
1 parent 3243979 commit d896aa3

File tree

2 files changed

+55
-41
lines changed

2 files changed

+55
-41
lines changed

operations/kubernetes/Restore_Postgres.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@ In the event that the VCS Postgres cluster must be rebuilt and the data restored
797797
1. (`ncn-mw#`) Restore the data.
798798

799799
```bash
800-
kubectl exec "${SERVICE}-0" -c postgres -n services -it -- psql -U postgres < "${DUMPFILE}"
800+
kubectl exec "${POSTGRESQL}-0" -c postgres -n services -it -- psql -U postgres < "${DUMPFILE}"
801801
```
802802

803803
Errors such as `... already exists` can be ignored; the restore can be considered successful when it completes.

update_product_stream/README.md

+54-40
Original file line numberDiff line numberDiff line change
@@ -20,46 +20,42 @@ Acquire a CSM software release tarball for installation on the HPE Cray EX super
2020
The following procedure should work on any Linux system. If directed here from another procedure, then that source procedure should indicate on which system the CSM release should
2121
be downloaded and extracted.
2222

23-
1. Download the CSM software release tarball.
23+
1. (`linux#`) Set the `ENDPOINT` variable to the URL of the server hosting the CSM tarball.
2424

2525
```bash
2626
ENDPOINT=URL_SERVER_Hosting_tarball
2727
```
2828

29+
1. (`linux#`) Set the `CSM_RELEASE` variable to the version of CSM software to be downloaded.
30+
2931
```bash
3032
CSM_RELEASE=x.y.z
3133
```
3234

35+
1. (`linux#`) Download the CSM software release tarball.
36+
3337
> ***NOTE:*** CSM does NOT support the use of proxy servers for anything other than downloading artifacts from external endpoints.
34-
Using `http_proxy` or `https_proxy` in any way other than the following examples will cause many failures in subsequent steps.
38+
> Using `http_proxy` or `https_proxy` in any way other than the following examples will cause many failures in subsequent steps.
3539

3640
- Without proxy:
3741

3842
```bash
3943
wget "${ENDPOINT}/csm-${CSM_RELEASE}.tar.gz"
4044
```
4145

42-
- With https proxy:
43-
44-
```bash
45-
https_proxy=https://example.proxy.net:443
46-
```
46+
- With HTTPS proxy:
4747

4848
```bash
49-
wget "${ENDPOINT}/csm-${CSM_RELEASE}.tar.gz"
49+
https_proxy=https://example.proxy.net:443 wget "${ENDPOINT}/csm-${CSM_RELEASE}.tar.gz"
5050
```
5151

52-
- With http proxy:
52+
- With HTTP proxy:
5353

5454
```bash
55-
http_proxy=http://example.proxy.net:80
56-
```
57-
58-
```bash
59-
wget "${ENDPOINT}/csm-${CSM_RELEASE}.tar.gz"
55+
http_proxy=http://example.proxy.net:80 wget "${ENDPOINT}/csm-${CSM_RELEASE}.tar.gz"
6056
```
6157

62-
1. Extract the release distribution.
58+
1. (`linux#`) Extract the release distribution.
6359

6460
```bash
6561
tar -xzvf "csm-${CSM_RELEASE}.tar.gz"
@@ -84,7 +80,7 @@ The following requirements must be met on the system where the procedure is bein
8480
procedure on the same system where the [Download and extract CSM product release](#download-and-extract-csm-product-release)
8581
procedure was followed.
8682

87-
- Git version `2.16.5` or higher must be installed.
83+
- (`linux#`) Git version `2.16.5` or higher must be installed.
8884

8985
```bash
9086
git version
@@ -100,54 +96,75 @@ The following requirements must be met on the system where the procedure is bein
10096

10197
### Apply patch to CSM release: Procedure
10298

103-
1. Download the compressed CSM software package patch file.
104-
105-
The file name will be of the form `csm-x.y.z-x.z.a.patch.gz`.
106-
Be sure to modify the following example with the appropriate values.
99+
1. (`linux#`) Set the `ENDPOINT` variable to the URL of the server hosting the CSM patch file.
107100

108101
```bash
109-
ENDPOINT=URL_SERVER_Hosting_tarball
102+
ENDPOINT=URL_SERVER_Hosting_patch
110103
```
111104

105+
1. (`linux#`) Set the `CSM_RELEASE` variable to the version of CSM software to be patched.
106+
112107
```bash
113108
CSM_RELEASE=x.y.z
114109
```
115110

111+
1. (`linux#`) Set the `PATCH_RELEASE` variable to the version of CSM patch.
112+
116113
```bash
117114
PATCH_RELEASE=x.z.a
118115
```
119116

120-
```bash
121-
wget "${ENDPOINT}/csm-${CSM_RELEASE}-${PATCH_RELEASE}.patch.gz"
122-
```
117+
1. (`linux#`) Download the compressed CSM software package patch file.
123118

124-
1. Uncompress the patch.
119+
The file name will be of the form `csm-x.y.z-x.z.a.patch.gz`.
120+
Be sure to modify the following example with the appropriate values.
121+
122+
> ***NOTE:*** CSM does NOT support the use of proxy servers for anything other than downloading artifacts from external endpoints.
123+
> Using `http_proxy` or `https_proxy` in any way other than the following examples will cause many failures in subsequent steps.
124+
125+
- Without proxy:
126+
127+
```bash
128+
wget "${ENDPOINT}/csm-${CSM_RELEASE}-${PATCH_RELEASE}.patch.gz"
129+
```
130+
131+
- With HTTPS proxy:
132+
133+
```bash
134+
https_proxy=https://example.proxy.net:443 wget "${ENDPOINT}/csm-${CSM_RELEASE}-${PATCH_RELEASE}.patch.gz"
135+
```
136+
137+
- With HTTP proxy:
138+
139+
```bash
140+
http_proxy=http://example.proxy.net:80 wget "${ENDPOINT}/csm-${CSM_RELEASE}-${PATCH_RELEASE}.patch.gz"
141+
```
142+
143+
1. (`linux#`) Uncompress the patch.
125144

126145
```bash
127146
gunzip -v "csm-${CSM_RELEASE}-${PATCH_RELEASE}.patch.gz"
128147
```
129148

130-
1. Apply the patch.
149+
1. (`linux#`) Apply the patch.
131150

132151
```bash
133-
git apply -p2 --whitespace=nowarn \
134-
--directory="csm-${CSM_RELEASE}" \
135-
"csm-${CSM_RELEASE}-${PATCH_RELEASE}.patch"
152+
git apply -p2 --whitespace=nowarn --directory="csm-${CSM_RELEASE}" "csm-${CSM_RELEASE}-${PATCH_RELEASE}.patch"
136153
```
137154

138-
1. Set a variable to reflect the new version.
155+
1. (`linux#`) Set a variable to reflect the new version.
139156

140157
```bash
141158
NEW_CSM_RELEASE="$(./csm-${CSM_RELEASE}/lib/version.sh)"
142159
```
143160

144-
1. Update the name of the CSM release distribution directory.
161+
1. (`linux#`) Update the name of the CSM release distribution directory.
145162

146163
```bash
147164
mv -v "csm-${CSM_RELEASE}" "csm-${NEW_CSM_RELEASE}"
148165
```
149166

150-
1. Create a tarball from the patched release distribution.
167+
1. (`linux#`) Create a tarball from the patched release distribution.
151168

152169
```bash
153170
tar -cvzf "csm-${NEW_CSM_RELEASE}.tar.gz" "csm-${NEW_CSM_RELEASE}/"
@@ -162,19 +179,19 @@ Acquire the latest documentation RPM. This may include updates, corrections, and
162179
> ***NOTE:*** CSM does NOT support the use of proxy servers for anything other than downloading artifacts from external endpoints.
163180
> Using http proxies in any way other than the following examples will cause many failures in subsequent steps.
164181

165-
1. Check the version of the currently installed CSM documentation and CSM library.
182+
1. (`linux#`) Check the version of the currently installed CSM documentation and CSM library.
166183

167184
```bash
168185
rpm -q docs-csm libcsm
169186
```
170187

171-
1. Set the `CSM_RELEASE` variable to the installed version of CSM.
188+
1. (`linux#`) Set the `CSM_RELEASE` variable to the installed version of CSM.
172189

173190
```bash
174191
CSM_RELEASE=x.y.z
175192
```
176193

177-
1. Download and upgrade the latest documentation RPM and CSM library.
194+
1. (`linux#`) Download and upgrade the latest documentation RPM and CSM library.
178195

179196
- Without proxy:
180197

@@ -183,14 +200,11 @@ Acquire the latest documentation RPM. This may include updates, corrections, and
183200
wget "https://release.algol60.net/lib/sle-$(awk -F= '/VERSION=/{gsub(/["-]/, "") ; print tolower($NF)}' /etc/os-release)/libcsm-latest.noarch.rpm" -O /root/libcsm-latest.noarch.rpm
184201
```
185202

186-
- With https proxy:
203+
- With HTTPS proxy:
187204

188205
```bash
189206
https_proxy=https://example.proxy.net:443 wget "https://release.algol60.net/$(awk -F. '{print "csm-"$1"."$2}' <<< ${CSM_RELEASE})/docs-csm/docs-csm-latest.noarch.rpm" \
190207
-O /root/docs-csm-latest.noarch.rpm
191-
```
192-
193-
```bash
194208
https_proxy=https://example.proxy.net:443 wget "https://release.algol60.net/lib/sle-$(awk -F= '/VERSION=/{gsub(/["-]/, "") ; print tolower($NF)}' /etc/os-release)/libcsm-latest.noarch.rpm" \
195209
-O /root/libcsm-latest.noarch.rpm
196210
```
@@ -217,7 +231,7 @@ Acquire the latest documentation RPM. This may include updates, corrections, and
217231
ssh ncn-m001
218232
```
219233

220-
1. Install the documentation RPM and CSM library.
234+
1. (`linux#`) Install the documentation RPM and CSM library.
221235

222236
```bash
223237
rpm -Uvh --force /root/docs-csm-latest.noarch.rpm /root/libcsm-latest.noarch.rpm

0 commit comments

Comments
 (0)