Skip to content

Commit 505df36

Browse files
rustydbrustydb
committed
refactor
1 parent f023d26 commit 505df36

File tree

7 files changed

+30
-30
lines changed

7 files changed

+30
-30
lines changed

‎install/bootstrap_livecd_remote_iso.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,11 @@ On first login (over SSH or at local console) the LiveCD will prompt the adminis
243243
were downloaded to a system using the instructions in [Check for Latest Workarounds and Documentation Updates](../update_product_stream/index.md#workarounds). Use that set of RPMs rather than downloading again.
244244

245245
```bash
246-
linux# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm-install/docs-csm-install-latest.noarch.rpm
246+
linux# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm/docs-csm-latest.noarch.rpm
247247
linux# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/csm-install-workarounds/csm-install-workarounds-latest.noarch.rpm
248-
linux# scp -p docs-csm-install-*rpm csm-install-workarounds-*rpm ncn-m001:/root
248+
linux# scp -p docs-csm-*rpm csm-install-workarounds-*rpm ncn-m001:/root
249249
linux# ssh ncn-m001
250-
pit# rpm -Uvh --force docs-csm-install-latest.noarch.rpm
250+
pit# rpm -Uvh --force docs-csm-latest.noarch.rpm
251251
pit# rpm -Uvh --force csm-install-workarounds-latest.noarch.rpm
252252
```
253253

‎install/bootstrap_livecd_usb.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -669,11 +669,11 @@ On first login (over SSH or at local console) the LiveCD will prompt the adminis
669669
were downloaded to a system using the instructions in [Check for Latest Workarounds and Documentation Updates](../update_product_stream/index.md#workarounds). Use that set of RPMs rather than downloading again.
670670
671671
```bash
672-
linux# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm-install/docs-csm-install-latest.noarch.rpm
672+
linux# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm/docs-csm-latest.noarch.rpm
673673
linux# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/csm-install-workarounds/csm-install-workarounds-latest.noarch.rpm
674-
linux# scp -p docs-csm-install-*rpm csm-install-workarounds-*rpm ncn-m001:/root
674+
linux# scp -p docs-csm-*rpm csm-install-workarounds-*rpm ncn-m001:/root
675675
linux# ssh ncn-m001
676-
pit# rpm -Uvh --force docs-csm-install-latest.noarch.rpm
676+
pit# rpm -Uvh --force docs-csm-latest.noarch.rpm
677677
pit# rpm -Uvh --force csm-install-workarounds-latest.noarch.rpm
678678
```
679679

‎install/redeploy_pit_node.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -433,11 +433,11 @@ the Kubernetes cluster as the final of three master nodes forming a quorum.
433433
were downloaded to a system using the instructions in [Check for Latest Workarounds and Documentation Updates](../update_product_stream/index.md#workarounds). Use that set of RPMs rather than downloading again.
434434

435435
```bash
436-
linux# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm-install/docs-csm-install-latest.noarch.rpm
436+
linux# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm/docs-csm-latest.noarch.rpm
437437
linux# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/csm-install-workarounds/csm-install-workarounds-latest.noarch.rpm
438-
linux# scp -p docs-csm-install-*rpm csm-install-workarounds-*rpm ncn-m001:/root
438+
linux# scp -p docs-csm-*rpm csm-install-workarounds-*rpm ncn-m001:/root
439439
linux# ssh ncn-m001
440-
ncn-m001# rpm -Uvh docs-csm-install-latest.noarch.rpm
440+
ncn-m001# rpm -Uvh docs-csm-latest.noarch.rpm
441441
ncn-m001# rpm -Uvh csm-install-workarounds-latest.noarch.rpm
442442
```
443443

‎operations/package_repository_management/Manage_Repositories_with_Nexus.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ For example, to list the names of all components in the `csm-sle-15sp2` reposito
134134
| jq -r '.items[] | .name' | sort -u
135135
noarch/basecamp-1.0.1-20210126131805_a665272.noarch.rpm
136136
noarch/csm-testing-1.3.2-20210205160852_e012960.noarch.rpm
137-
noarch/docs-csm-install-1.7.4-20210206165423_2fae6fa.noarch.rpm
137+
noarch/docs-csm-1.7.4-20210206165423_2fae6fa.noarch.rpm
138138
noarch/dracut-metal-dmk8s-1.4.7-20210129115153_7a86571.noarch.rpm
139139
noarch/dracut-metal-luksetcd-1.0.2-20210129115153_b34f9a5.noarch.rpm
140140
noarch/dracut-metal-mdsquash-1.4.20-20210201222655_e20e2ee.noarch.rpm
@@ -210,7 +210,7 @@ For example, to list the download URLs for each asset in the `csm-sle-15sp2` rep
210210
| jq -r '.items[] | .assets[] | .downloadUrl' | sort -u
211211
https://packages.local/repository/csm-sle-15sp2/noarch/basecamp-1.0.1-20210126131805_a665272.noarch.rpm
212212
https://packages.local/repository/csm-sle-15sp2/noarch/csm-testing-1.3.2-20210205160852_e012960.noarch.rpm
213-
https://packages.local/repository/csm-sle-15sp2/noarch/docs-csm-install-1.7.4-20210206165423_2fae6fa.noarch.rpm
213+
https://packages.local/repository/csm-sle-15sp2/noarch/docs-csm-1.7.4-20210206165423_2fae6fa.noarch.rpm
214214
https://packages.local/repository/csm-sle-15sp2/noarch/dracut-metal-dmk8s-1.4.7-20210129115153_7a86571.noarch.rpm
215215
https://packages.local/repository/csm-sle-15sp2/noarch/dracut-metal-luksetcd-1.0.2-20210129115153_b34f9a5.noarch.rpm
216216
https://packages.local/repository/csm-sle-15sp2/noarch/dracut-metal-mdsquash-1.4.20-20210201222655_e20e2ee.noarch.rpm

‎update_product_stream/index.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
The software included in the CSM product stream is released in more than one way. The initial product release may be augmented with patches, late-breaking workarounds and documentation updates, or hotfixes after the release.
44

5-
The CSM documentation is included within the CSM product release tarball inside the docs-csm-install RPM.
5+
The CSM documentation is included within the CSM product release tarball inside the docs-csm RPM.
66
After it has been installed, the documentation will be available at `/usr/share/doc/csm` as installed by
7-
the docs-csm-install RPM.
7+
the docs-csm RPM.
88

99
### Topics:
1010
* [Download and Extract CSM Product Release](#download-and-extract)
@@ -138,7 +138,7 @@ Acquire the late-breaking CSM workarounds and documentation update RPMs. These f
138138
This command will report the version of your installed documentation.
139139
140140
```bash
141-
ncn# rpm -q docs-csm-install
141+
ncn# rpm -q docs-csm
142142
```
143143
144144
@@ -150,31 +150,31 @@ None.
150150
1. Check the version of the currently installed CSM documentation.
151151
152152
```bash
153-
ncn# rpm -q docs-csm-install
153+
ncn# rpm -q docs-csm
154154
```
155155
156156
1. Download and upgrade the latest workaround and documentation RPMs.
157157
158158
```bash
159-
linux# rpm -Uvh --force https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm-install/docs-csm-install-latest.noarch.rpm
159+
linux# rpm -Uvh --force https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm/docs-csm-latest.noarch.rpm
160160
linux# rpm -Uvh --force https://storage.googleapis.com/csm-release-public/shasta-1.5/csm-install-workarounds/csm-install-workarounds-latest.noarch.rpm
161161
```
162162
163163
If this machine does not have direct Internet access these RPMs will need to be externally downloaded and then copied to the system. This example copies them to ncn-m001.
164164
165165
```bash
166-
linux# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm-install/docs-csm-install-latest.noarch.rpm
166+
linux# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm/docs-csm-latest.noarch.rpm
167167
linux# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/csm-install-workarounds/csm-install-workarounds-latest.noarch.rpm
168-
linux# scp -p docs-csm-install-*rpm csm-install-workarounds-*rpm ncn-m001:/root
168+
linux# scp -p docs-csm-*rpm csm-install-workarounds-*rpm ncn-m001:/root
169169
linux# ssh ncn-m001
170-
ncn-m001# rpm -Uvh --force docs-csm-install-latest.noarch.rpm
170+
ncn-m001# rpm -Uvh --force docs-csm-latest.noarch.rpm
171171
ncn-m001# rpm -Uvh --force csm-install-workarounds-latest.noarch.rpm
172172
```
173173
174174
1. Check the version of the newly installed documentation.
175175
176176
```bash
177-
ncn# rpm -q docs-csm-install
177+
ncn# rpm -q docs-csm
178178
```
179179
180180
<a name="apply-workarounds"></a>

‎upgrade/1.0/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ This check will also be conducted in the 'prerequisites.sh' script listed below
3838
* Internet Connected
3939

4040
```bash
41-
ncn-m001# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm-install/docs-csm-install-latest.noarch.rpm
42-
ncn-m001# rpm -Uvh docs-csm-install-latest.noarch.rpm
41+
ncn-m001# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm/docs-csm-latest.noarch.rpm
42+
ncn-m001# rpm -Uvh docs-csm-latest.noarch.rpm
4343
```
4444

4545
* Air Gapped
4646

4747
```bash
48-
ncn-m001# rpm -Uvh [PATH_TO_docs-csm-install-*.noarch.rpm]
48+
ncn-m001# rpm -Uvh [PATH_TO_docs-csm-*.noarch.rpm]
4949
```
5050

5151
#### Stage 0.2. - Update `customizations.yaml`
@@ -387,8 +387,8 @@ For ncn-m001, use ncn-m002 as the stable NCN:
387387
Install document RPM package:
388388
389389
```bash
390-
ncn-m002# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm-install/docs-csm-install-latest.noarch.rpm
391-
ncn-m002# rpm -Uvh docs-csm-install-latest.noarch.rpm
390+
ncn-m002# wget https://storage.googleapis.com/csm-release-public/shasta-1.5/docs-csm/docs-csm-latest.noarch.rpm
391+
ncn-m002# rpm -Uvh docs-csm-latest.noarch.rpm
392392
```
393393
394394
Run:
@@ -404,7 +404,7 @@ ncn-m002# /usr/share/doc/csm/upgrade/1.0/scripts/upgrade/prerequisites.sh --csm-
404404
Install document RPM package:
405405
406406
```bash
407-
ncn-m002# rpm -Uvh [PATH_TO_docs-csm-install-*.noarch.rpm]
407+
ncn-m002# rpm -Uvh [PATH_TO_docs-csm-*.noarch.rpm]
408408
```
409409
410410
Run:

‎upgrade/1.0/scripts/upgrade/prerequisites.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ state_name="UPDATE_DOC_RPM"
208208
state_recorded=$(is_state_recorded "${state_name}" $(hostname))
209209
if [[ $state_recorded == "0" ]]; then
210210
echo "====> ${state_name} ..."
211-
if [[ ! -f docs-csm-install-latest.noarch.rpm ]]; then
212-
echo "Please make sure 'docs-csm-install-latest.noarch.rpm' exists under: $(pwd)"
211+
if [[ ! -f docs-csm-latest.noarch.rpm ]]; then
212+
echo "Please make sure 'docs-csm-latest.noarch.rpm' exists under: $(pwd)"
213213
fi
214-
cp docs-csm-install-latest.noarch.rpm ${CSM_ARTI_DIR}/rpm/cray/csm/sle-15sp2/noarch/
214+
cp docs-csm-latest.noarch.rpm ${CSM_ARTI_DIR}/rpm/cray/csm/sle-15sp2/noarch/
215215
record_state ${state_name} $(hostname)
216216
else
217217
echo "====> ${state_name} has been completed"
@@ -415,7 +415,7 @@ if [[ $state_recorded == "0" ]]; then
415415
echo "export KUBERNETES_VERSION=${KUBERNETES_VERSION}" >> /etc/cray/upgrade/csm/myenv
416416
echo "export CSM_RELEASE=${CSM_RELEASE}" >> /etc/cray/upgrade/csm/myenv
417417
echo "export CSM_ARTI_DIR=${CSM_ARTI_DIR}" >> /etc/cray/upgrade/csm/myenv
418-
echo "export DOC_RPM_NEXUS_URL=https://packages.local/repository/csm-sle-15sp2/$(ls ${CSM_ARTI_DIR}/rpm/cray/csm/sle-15sp2/noarch/docs-csm-install-latest.noarch.rpm | awk -F'/sle-15sp2/' '{print $2}')" >> /etc/cray/upgrade/csm/myenv
418+
echo "export DOC_RPM_NEXUS_URL=https://packages.local/repository/csm-sle-15sp2/$(ls ${CSM_ARTI_DIR}/rpm/cray/csm/sle-15sp2/noarch/docs-csm-latest.noarch.rpm | awk -F'/sle-15sp2/' '{print $2}')" >> /etc/cray/upgrade/csm/myenv
419419

420420
record_state ${state_name} $(hostname)
421421
else

0 commit comments

Comments
 (0)