Skip to content

Commit 67f2323

Browse files
author
cgruver
committed
update for disconnected install
1 parent c653adc commit 67f2323

File tree

11 files changed

+314
-81
lines changed

11 files changed

+314
-81
lines changed

‎NanoPiConfig.md‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
2+
3+
## Format Disk
4+
5+
```bash
6+
ssh [email protected]
7+
8+
opkg update
9+
opkg install lsblk sfdisk losetup resize2fs
10+
SD_DEV=mmcblk1
11+
SD_PART=mmcblk1p
12+
13+
PART_INFO=$(sfdisk -l /dev/${SD_DEV} | grep ${SD_PART}2)
14+
let P2_START=$(echo ${PART_INFO} | cut -d" " -f2)
15+
sfdisk --no-reread -f --delete /dev/${SD_DEV} 2
16+
sfdisk --no-reread -f -d /dev/${SD_DEV} > /tmp/part.info
17+
echo "/dev/${SD_PART}2 : start= ${P2_START}, type=83" >> /tmp/part.info
18+
sfdisk --no-reread -f /dev/${SD_DEV} < /tmp/part.info
19+
rm /tmp/part.info
20+
reboot
21+
ssh [email protected]
22+
LOOP="$(losetup -f)"
23+
losetup ${LOOP} /dev/mmcblk1p2
24+
e2fsck -y -f ${LOOP}
25+
resize2fs ${LOOP}
26+
reboot
27+
28+
ssh [email protected]
29+
opkg update
30+
opkg install ip-full uhttpd shadow bash wget git-http ca-bundle procps-ng-ps rsync curl libstdcpp6 libjpeg libnss lftp block-mount unzip wipefs
31+
opkg list | grep "^coreutils-" | while read i
32+
do
33+
opkg install $(echo ${i} | cut -d" " -f1)
34+
done
35+
36+
echo "Creating SSH keys"
37+
rm -rf /root/.ssh
38+
mkdir -p /root/.ssh
39+
dropbearkey -t ed25519 -f /root/.ssh/id_dropbear
40+
41+
echo "creating /usr/local filesystem"
42+
wipefs -af /dev/mmcblk1p3
43+
mkfs.ext4 /dev/mmcblk1p3
44+
let RC=0
45+
while [[ ${RC} -eq 0 ]]
46+
do uci delete fstab.@mount[-1]
47+
let RC=$?
48+
done
49+
PART_UUID=$(block info /dev/mmcblk1p3 | cut -d\" -f2)
50+
MOUNT=$(uci add fstab mount)
51+
uci set fstab.${MOUNT}.target=/usr/local
52+
uci set fstab.${MOUNT}.uuid=${PART_UUID}
53+
uci set fstab.${MOUNT}.enabled=1
54+
uci commit fstab
55+
block mount
56+
mkdir -p /usr/local/www/install/kickstart
57+
mkdir /usr/local/www/install/postinstall
58+
mkdir /usr/local/www/install/fcos
59+
mkdir -p /root/bin
60+
for i in BaseOS AppStream
61+
do mkdir -p /usr/local/www/install/repos/${i}/x86_64/os/
62+
done
63+
dropbearkey -y -f /root/.ssh/id_dropbear | grep "ssh-" >> /usr/local/www/install/postinstall/authorized_keys
64+
65+
## Set Up Network
66+
67+
```bash
68+
cat ${OKD_LAB_PATH}/ssh_key.pub | ssh [email protected] "cat >> /etc/dropbear/authorized_keys"
69+
ssh [email protected] "uci set dropbear.@dropbear[0].PasswordAuth=off ; \
70+
uci set dropbear.@dropbear[0].RootPasswordAuth=off ; \
71+
uci set network.lan.ipaddr="${PI_IP}" ; \
72+
uci set network.lan.netmask=${EDGE_NETMASK} ; \
73+
uci set network.lan.hostname=bastion.${LAB_DOMAIN} ; \
74+
uci set network.lan.gateway=${EDGE_ROUTER} ; \
75+
uci set network.lan.dns=${EDGE_ROUTER} ; \
76+
uci commit ; \
77+
rm -rf /etc/rc.d/*dnsmasq* ; \
78+
poweroff"
79+
```
80+
81+
```bash
82+
new_rule=$(ssh [email protected] "uci add firewall rule")
83+
ssh [email protected] "uci set firewall.${new_rule}.enabled=1 ; \
84+
uci set firewall.${new_rule}.target=REJECT ; \
85+
uci set firewall.${new_rule}.src=lan ; \
86+
uci set firewall.${new_rule}.dest=wan ; \
87+
uci set firewall.${new_rule}.name=${CLUSTER_NAME}-internet-deny ; \
88+
uci set firewall.${new_rule}.proto=all ; \
89+
uci set firewall.${new_rule}.family=ipv4"
90+
let node_count=$(yq e ".control-plane.nodes" ${CLUSTER_CONFIG} | yq e 'length' -)
91+
let node_index=0
92+
while [[ node_index -lt ${node_count} ]]
93+
do
94+
node_ip=$(yq e ".control-plane.nodes.[${node_index}].ip-addr" ${CLUSTER_CONFIG})
95+
ssh [email protected] "uci add_list firewall.${new_rule}.src_ip=\"${node_ip}\""
96+
node_index=$(( ${node_index} + 1 ))
97+
done
98+
let node_count=$(yq e ".compute-nodes" ${CLUSTER_CONFIG} | yq e 'length' -)
99+
let node_index=0
100+
while [[ node_index -lt ${node_count} ]]
101+
do
102+
node_ip=$(yq e ".compute-nodes.[${node_index}].ip-addr" ${CLUSTER_CONFIG})
103+
ssh [email protected] "uci add_list firewall.${new_rule}.src_ip=\"${node_ip}\""
104+
node_index=$(( ${node_index} + 1 ))
105+
done
106+
ssh [email protected] "uci commit firewall && /etc/init.d/firewall restart"
107+
```

‎bin/clusterButaneConfig.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ storage:
158158
rtcsync
159159
logdir /var/log/chrony
160160
EOF
161-
cp ${WORK_DIR}/98-cluster-config.yaml ${WORK_DIR}/okd-install-dir/openshift/98-cluster-config.yaml
161+
cp ${WORK_DIR}/98-cluster-config.yaml ${WORK_DIR}/openshift-install-dir/openshift/98-cluster-config.yaml
162162
}
163163

164164
function createClusterCephMC() {
@@ -181,7 +181,7 @@ storage:
181181
start_mib: 102400
182182
size_mib: 0
183183
EOF
184-
cp ${WORK_DIR}/98-cluster-ceph-config.yaml ${WORK_DIR}/okd-install-dir/openshift/98-cluster-ceph-config.yaml
184+
cp ${WORK_DIR}/98-cluster-ceph-config.yaml ${WORK_DIR}/openshift-install-dir/openshift/98-cluster-ceph-config.yaml
185185
}
186186

187187
function createHostPathMC() {
@@ -235,7 +235,7 @@ systemd:
235235
enabled: true
236236
name: var-hostpath.mount
237237
EOF
238-
cp ${WORK_DIR}/98-hostpath-config.yaml ${WORK_DIR}/okd-install-dir/openshift/98-hostpath-config.yaml
238+
cp ${WORK_DIR}/98-hostpath-config.yaml ${WORK_DIR}/openshift-install-dir/openshift/98-hostpath-config.yaml
239239
}
240240

241241
function getMcVersion() {

‎bin/clusterDeploy.sh‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ EOF
3838

3939
function createClusterConfig() {
4040

41-
mkdir ${WORK_DIR}/okd-install-dir/openshift
41+
mkdir ${WORK_DIR}/openshift-install-dir/openshift
4242
createClusterCustomMC
4343
if [[ $(yq ".control-plane | has(\"ceph\")" ${CLUSTER_CONFIG}) == "true" ]]
4444
then
@@ -85,23 +85,33 @@ function createClusterConfig() {
8585
yq e ".hosts.[${node_index}].networkConfig.routes.config.[0].table-id = 254" -i ${WORK_DIR}/agent-config.yaml
8686
node_index=$(( ${node_index} + 1 ))
8787
done
88-
cp ${WORK_DIR}/agent-config.yaml ${WORK_DIR}/okd-install-dir/agent-config.yaml
88+
cp ${WORK_DIR}/agent-config.yaml ${WORK_DIR}/openshift-install-dir/agent-config.yaml
8989
}
9090

9191
function appendDisconnectedInstallConfig() {
9292

93-
NEXUS_CERT=$( openssl s_client -showcerts -connect ${PROXY_REGISTRY} </dev/null 2>/dev/null|openssl x509 -outform PEM | while read line ; do echo " ${line}" ; done )
93+
release_type=$(yq e ".cluster.release-type" ${CLUSTER_CONFIG})
94+
if [[ ${release_type} == "ocp" ]]
95+
then
96+
source_1="quay.io/openshift-release-dev/ocp-release"
97+
source_2="quay.io/openshift-release-dev/ocp-v4.0-art-dev"
98+
else
99+
source_1="quay.io/openshift/okd"
100+
source_2="quay.io/openshift/okd-content"
101+
fi
102+
103+
NEXUS_CERT=$( openssl s_client -showcerts -connect ${PROXY_REGISTRY} </dev/null 2>/dev/null|openssl x509 -outform PEM | while read line ; do echo " ${line}" ; done )
94104

95105
cat << EOF >> ${WORK_DIR}/install-config-upi.yaml
96106
additionalTrustBundle: |
97107
${NEXUS_CERT}
98-
imageContentSources:
108+
imageDigestSources:
99109
- mirrors:
100-
- ${PROXY_REGISTRY}/okd
101-
source: quay.io/openshift/okd
110+
- ${PROXY_REGISTRY}/openshift
111+
source: ${source_1}
102112
- mirrors:
103-
- ${PROXY_REGISTRY}/okd
104-
source: quay.io/openshift/okd-content
113+
- ${PROXY_REGISTRY}/openshift
114+
source: ${source_2}
105115
EOF
106116
}
107117

@@ -199,7 +209,7 @@ function deployCluster() {
199209
rm -rf ${WORK_DIR}
200210
mkdir -p ${WORK_DIR}/ipxe-work-dir/ignition
201211
mkdir ${WORK_DIR}/dns-work-dir
202-
mkdir ${WORK_DIR}/okd-install-dir
212+
mkdir ${WORK_DIR}/openshift-install-dir
203213
if [[ -d ${OKD_LAB_PATH}/lab-config/${CLUSTER_NAME}.${DOMAIN} ]]
204214
then
205215
rm -rf ${OKD_LAB_PATH}/lab-config/${CLUSTER_NAME}.${DOMAIN}
@@ -222,11 +232,11 @@ function deployCluster() {
222232
then
223233
appendDisconnectedInstallConfig
224234
fi
225-
cp ${WORK_DIR}/install-config-upi.yaml ${WORK_DIR}/okd-install-dir/install-config.yaml
235+
cp ${WORK_DIR}/install-config-upi.yaml ${WORK_DIR}/openshift-install-dir/install-config.yaml
226236
createClusterConfig
227-
openshift-install --dir=${WORK_DIR}/okd-install-dir agent create pxe-files
237+
openshift-install --dir=${WORK_DIR}/openshift-install-dir agent create pxe-files
228238
configControlPlane
229-
cp ${WORK_DIR}/okd-install-dir/auth/kubeconfig ${KUBE_INIT_CONFIG}
239+
cp ${WORK_DIR}/openshift-install-dir/auth/kubeconfig ${KUBE_INIT_CONFIG}
230240
chmod 400 ${KUBE_INIT_CONFIG}
231241
prepNodeFiles
232242
}
@@ -277,7 +287,7 @@ function deployWorkers() {
277287
config_ceph=true
278288
fi
279289
fi
280-
createButaneConfig ${ip_addr} ${host_name}.${DOMAIN} ${mac_addr} worker ${platform} ${config_ceph} ${boot_dev}
290+
createButaneConfig ${ip_addr} ${host_name} ${mac_addr} worker ${platform} ${config_ceph} ${boot_dev}
281291
createPxeFile ${mac_addr} ${platform} ${boot_dev} ${host_name} ${ip_addr}
282292
# Create DNS entries
283293
echo "${host_name}.${DOMAIN}. IN A ${ip_addr} ; ${host_name}-${DOMAIN}-wk" >> ${WORK_DIR}/dns-work-dir/forward.zone

‎bin/clusterUtils.sh‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,22 +163,22 @@ function addUser() {
163163
then
164164
touch ${PASSWD_FILE}
165165
else
166-
${OC} get secret okd-htpasswd-secret -n openshift-config -o jsonpath='{.data.htpasswd}' | base64 -d > ${PASSWD_FILE}
166+
${OC} get secret openshift-htpasswd-secret -n openshift-config -o jsonpath='{.data.htpasswd}' | base64 -d > ${PASSWD_FILE}
167167
fi
168168
if [[ -z ${USER} ]]
169169
then
170170
echo "Usage: labcli --user [ -a | --admin ] -u=user-name-to-add"
171171
exit 1
172172
fi
173173
htpasswd -B ${PASSWD_FILE} ${USER}
174-
${OC} create -n openshift-config secret generic okd-htpasswd-secret --from-file=htpasswd=${PASSWD_FILE} -o yaml --dry-run='client' | ${OC} apply -f -
174+
${OC} create -n openshift-config secret generic openshift-htpasswd-secret --from-file=htpasswd=${PASSWD_FILE} -o yaml --dry-run='client' | ${OC} apply -f -
175175
if [[ ${ADMIN_USER} == "true" ]]
176176
then
177177
${OC} adm policy add-cluster-role-to-user cluster-admin ${USER}
178178
fi
179179
if [[ ${OAUTH_INIT} == "true" ]]
180180
then
181-
${OC} patch oauth cluster --type merge --patch '{"spec":{"identityProviders":[{"name":"okd_htpasswd_idp","mappingMethod":"claim","type":"HTPasswd","htpasswd":{"fileData":{"name":"okd-htpasswd-secret"}}}]}}'
181+
${OC} patch oauth cluster --type merge --patch '{"spec":{"identityProviders":[{"name":"openshift_htpasswd_idp","mappingMethod":"claim","type":"HTPasswd","htpasswd":{"fileData":{"name":"openshift-htpasswd-secret"}}}]}}'
182182
${OC} delete secrets kubeadmin -n kube-system
183183
fi
184184
rm -rf ${PWD_WORK_DIR}
@@ -228,8 +228,17 @@ function createPullSecret() {
228228
echo "Passwords do not match. Try Again."
229229
fi
230230
done
231-
NEXUS_SECRET=$(echo -n "${NEXUS_USER}:${NEXUS_PWD}" | base64)
232-
echo -n "{\"auths\": {\"fake\": {\"auth\": \"Zm9vOmJhcgo=\"},\"nexus.${LAB_DOMAIN}:5001\": {\"auth\": \"${NEXUS_SECRET}\"}}}" > ${PULL_SECRET}
231+
NEXUS_SECRET=$(echo -n "${NEXUS_USER}:${NEXUS_PWD}" | base64)
232+
release_type=$(yq e ".cluster.release-type" ${CLUSTER_CONFIG})
233+
if [[ ${release_type} == "ocp" ]]
234+
then
235+
cat ${OKD_LAB_PATH}/ocp-pull-secret | jq -c .auths | yq -p=json > ${PULL_SECRET}.yaml
236+
else
237+
echo "{\"fake\": {\"auth\": \"Zm9vOmJhcgo=\"}" | yq -p=json > ${PULL_SECRET}.yaml
238+
fi
239+
echo -n "{\"nexus.${LAB_DOMAIN}:5000\": {\"auth\": \"${NEXUS_SECRET}\"}}" | yq -p=json >> ${PULL_SECRET}.yaml
240+
echo -n "{\"auths\": $(cat ${PULL_SECRET}.yaml | yq -o=json)}" > ${PULL_SECRET}
241+
# cat ${PULL_SECRET}.yaml | yq -o=json > ${PULL_SECRET}
233242
NEXUS_PWD=""
234243
NEXUS_PWD_CHK=""
235244
}
@@ -353,7 +362,7 @@ function configInfraNodes() {
353362

354363
for node_index in 0 1 2
355364
do
356-
${OC} label nodes ${CLUSTER_NAME}-cp-${node_index}.${DOMAIN} node-role.kubernetes.io/infra=""
365+
${OC} label nodes ${CLUSTER_NAME}-cp-${node_index} node-role.kubernetes.io/infra=""
357366
done
358367
${OC} patch scheduler cluster --patch '{"spec":{"mastersSchedulable":false}}' --type=merge
359368
${OC} patch -n openshift-ingress-operator ingresscontroller default --patch '{"spec":{"nodePlacement":{"nodeSelector":{"matchLabels":{"node-role.kubernetes.io/infra":""}},"tolerations":[{"key":"node.kubernetes.io/unschedulable","effect":"NoSchedule"},{"key":"node-role.kubernetes.io/master","effect":"NoSchedule"}]}}}' --type=merge
@@ -451,7 +460,7 @@ function mirrorOkdRelease() {
451460
rm -rf ${OKD_LAB_PATH}/lab-config/work-dir
452461
mkdir -p ${OKD_LAB_PATH}/lab-config/work-dir
453462
mkdir -p ${OKD_LAB_PATH}/lab-config/release-sigs
454-
oc adm -a ${PULL_SECRET} release mirror --from=${OPENSHIFT_REGISTRY}:${OPENSHIFT_RELEASE} --to=${LOCAL_REGISTRY}/okd --to-release-image=${LOCAL_REGISTRY}/okd:${OPENSHIFT_RELEASE} --release-image-signature-to-dir=${OKD_LAB_PATH}/lab-config/work-dir
463+
oc adm -a ${PULL_SECRET} release mirror --from=${OPENSHIFT_REGISTRY}:${OPENSHIFT_RELEASE} --to=${LOCAL_REGISTRY}/openshift --to-release-image=${LOCAL_REGISTRY}/openshift:${OPENSHIFT_RELEASE} --release-image-signature-to-dir=${OKD_LAB_PATH}/lab-config/work-dir
455464

456465
SIG_FILE=$(ls ${OKD_LAB_PATH}/lab-config/work-dir)
457466
mv ${OKD_LAB_PATH}/lab-config/work-dir/${SIG_FILE} ${OKD_LAB_PATH}/lab-config/release-sigs/${OPENSHIFT_RELEASE}-sig.yaml
@@ -584,10 +593,10 @@ function monitor() {
584593
do
585594
case $i in
586595
-b)
587-
openshift-install agent wait-for bootstrap-complete --dir=${OKD_LAB_PATH}/${CLUSTER_NAME}.${DOMAIN}/okd-install-dir --log-level debug
596+
openshift-install agent wait-for bootstrap-complete --dir=${OKD_LAB_PATH}/${CLUSTER_NAME}.${DOMAIN}/openshift-install-dir --log-level debug
588597
;;
589598
-i)
590-
openshift-install agent wait-for install-complete --dir=${OKD_LAB_PATH}/${CLUSTER_NAME}.${DOMAIN}/okd-install-dir --log-level debug
599+
openshift-install agent wait-for install-complete --dir=${OKD_LAB_PATH}/${CLUSTER_NAME}.${DOMAIN}/openshift-install-dir --log-level debug
591600
;;
592601
-m=*)
593602
CP_INDEX="${i#*=}"

‎bin/devTools.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ EOF
7979
${SCP} ${PI_WORK_DIR}/nexus root@${PI_IP}:/etc/init.d/nexus
8080
${SSH} root@${PI_IP} "chmod 755 /etc/init.d/nexus"
8181

82-
${SSH} root@${PI_IP} "/usr/local/java-1.8-openjdk/bin/keytool -genkeypair -keystore /usr/local/nexus/nexus-3/etc/ssl/keystore.jks -deststoretype pkcs12 -storepass password -keypass password -alias jetty -keyalg RSA -keysize 4096 -validity 5000 -dname \"CN=nexus.${LAB_DOMAIN}, OU=okd4-lab, O=okd4-lab, L=City, ST=State, C=US\" -ext \"SAN=DNS:nexus.${LAB_DOMAIN},IP:${PI_IP}\" -ext \"BC=ca:true\" ; \
82+
${SSH} root@${PI_IP} "/usr/local/java-1.8-openjdk/bin/keytool -genkeypair -keystore /usr/local/nexus/nexus-3/etc/ssl/keystore.jks -deststoretype pkcs12 -storepass password -keypass password -alias jetty -keyalg RSA -keysize 4096 -validity 5000 -dname \"CN=nexus.${LAB_DOMAIN}, OU=openshift4-lab, O=openshift4-lab, L=City, ST=State, C=US\" -ext \"SAN=DNS:nexus.${LAB_DOMAIN},IP:${PI_IP}\" -ext \"BC=ca:true\" ; \
8383
/usr/local/java-1.8-openjdk/bin/keytool -importkeystore -srckeystore /usr/local/nexus/nexus-3/etc/ssl/keystore.jks -destkeystore /usr/local/nexus/nexus-3/etc/ssl/keystore.jks -deststoretype pkcs12 -srcstorepass password ; \
8484
rm -f /usr/local/nexus/nexus-3/etc/ssl/keystore.jks.old ; \
8585
chown nexus:nexus /usr/local/nexus/nexus-3/etc/ssl/keystore.jks ; \
@@ -240,7 +240,7 @@ EOF
240240
wget -O keycloak-${KEYCLOAK_VER}.zip https://github.com/keycloak/keycloak/releases/download/${KEYCLOAK_VER}/keycloak-${KEYCLOAK_VER}.zip ; \
241241
unzip keycloak-${KEYCLOAK_VER}.zip ; \
242242
ln -s keycloak-${KEYCLOAK_VER} keycloak-server ; \
243-
/usr/local/java-11-openjdk/bin/keytool -genkeypair -keystore /usr/local/keycloak/keystore.jks -deststoretype pkcs12 -storepass password -keypass password -alias jetty -keyalg RSA -keysize 4096 -validity 5000 -dname \"CN=keycloak.${LAB_DOMAIN}, OU=okd4-lab, O=okd4-lab, L=City, ST=State, C=US\" -ext \"SAN=DNS:keycloak.${LAB_DOMAIN},IP:${PI_IP}\" -ext \"BC=ca:true\" ; \
243+
/usr/local/java-11-openjdk/bin/keytool -genkeypair -keystore /usr/local/keycloak/keystore.jks -deststoretype pkcs12 -storepass password -keypass password -alias jetty -keyalg RSA -keysize 4096 -validity 5000 -dname \"CN=keycloak.${LAB_DOMAIN}, OU=openshift4-lab, O=openshift4-lab, L=City, ST=State, C=US\" -ext \"SAN=DNS:keycloak.${LAB_DOMAIN},IP:${PI_IP}\" -ext \"BC=ca:true\" ; \
244244
mv /usr/local/keycloak/keycloak-server/conf/keycloak.conf /usr/local/keycloak/keycloak-server/conf/keycloak.conf.orig ; \
245245
mkdir -p /usr/local/keycloak/home ; \
246246
groupadd keycloak ; \
@@ -292,7 +292,7 @@ EOF
292292
mv /usr/local/apicurio/apicurio-studio/standalone/configuration/standalone-apicurio.xml /usr/local/apicurio/apicurio-studio/standalone/configuration/standalone-apicurio.xml.orig ; \
293293
mv /tmp/standalone-apicurio.xml /usr/local/apicurio/apicurio-studio/standalone/configuration/standalone-apicurio.xml ; \
294294
sed -i \"s|generate-self-signed-certificate-host=\\\"localhost\\\"||g\" /usr/local/apicurio/apicurio-studio/standalone/configuration/standalone-apicurio.xml ; \
295-
/usr/local/java-11-openjdk/bin/keytool -genkeypair -keystore /usr/local/apicurio/apicurio-studio/standalone/configuration/application.keystore -deststoretype pkcs12 -storepass password -keypass password -alias server -keyalg RSA -keysize 4096 -validity 5000 -dname \"CN=apicurio.${LAB_DOMAIN}, OU=okd4-lab, O=okd4-lab, L=City, ST=State, C=US\" -ext \"SAN=DNS:apicurio.${LAB_DOMAIN},IP:${PI_IP}\" -ext \"BC=ca:true\" ; \
295+
/usr/local/java-11-openjdk/bin/keytool -genkeypair -keystore /usr/local/apicurio/apicurio-studio/standalone/configuration/application.keystore -deststoretype pkcs12 -storepass password -keypass password -alias server -keyalg RSA -keysize 4096 -validity 5000 -dname \"CN=apicurio.${LAB_DOMAIN}, OU=openshift4-lab, O=openshift4-lab, L=City, ST=State, C=US\" -ext \"SAN=DNS:apicurio.${LAB_DOMAIN},IP:${PI_IP}\" -ext \"BC=ca:true\" ; \
296296
groupadd apicurio ; \
297297
useradd -g apicurio -d /usr/local/apicurio/home apicurio ; \
298298
chown -R apicurio:apicurio /usr/local/apicurio ; \

‎bin/hostUtils.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,11 @@ function prepNodeFiles() {
268268
${SSH} root@${INSTALL_HOST_IP} "mkdir -p /usr/local/www/install/fcos/ignition/${CLUSTER_NAME}.${DOMAIN}"
269269
if [[ ${AGENT} == "true" ]]
270270
then
271-
${SCP} ${WORK_DIR}/okd-install-dir/boot-artifacts/agent.x86_64-initrd.img root@${INSTALL_HOST_IP}:/usr/local/www/install/fcos/ignition/${CLUSTER_NAME}.${DOMAIN}/initrd
272-
${SCP} ${WORK_DIR}/okd-install-dir/boot-artifacts/agent.x86_64-vmlinuz root@${INSTALL_HOST_IP}:/usr/local/www/install/fcos/ignition/${CLUSTER_NAME}.${DOMAIN}/vmlinuz
273-
${SCP} ${WORK_DIR}/okd-install-dir/boot-artifacts/agent.x86_64-rootfs.img root@${INSTALL_HOST_IP}:/usr/local/www/install/fcos/ignition/${CLUSTER_NAME}.${DOMAIN}/rootfs.img
274-
# else
275-
# ${SCP} -r ${WORK_DIR}/ipxe-work-dir/ignition/*.ign root@${INSTALL_HOST_IP}:/usr/local/www/install/fcos/ignition/${CLUSTER_NAME}.${DOMAIN}/
271+
${SCP} ${WORK_DIR}/openshift-install-dir/boot-artifacts/agent.x86_64-initrd.img root@${INSTALL_HOST_IP}:/usr/local/www/install/fcos/ignition/${CLUSTER_NAME}.${DOMAIN}/initrd
272+
${SCP} ${WORK_DIR}/openshift-install-dir/boot-artifacts/agent.x86_64-vmlinuz root@${INSTALL_HOST_IP}:/usr/local/www/install/fcos/ignition/${CLUSTER_NAME}.${DOMAIN}/vmlinuz
273+
${SCP} ${WORK_DIR}/openshift-install-dir/boot-artifacts/agent.x86_64-rootfs.img root@${INSTALL_HOST_IP}:/usr/local/www/install/fcos/ignition/${CLUSTER_NAME}.${DOMAIN}/rootfs.img
274+
else
275+
${SCP} -r ${WORK_DIR}/ipxe-work-dir/ignition/*.ign root@${INSTALL_HOST_IP}:/usr/local/www/install/fcos/ignition/${CLUSTER_NAME}.${DOMAIN}/
276276
fi
277277
${SSH} root@${INSTALL_HOST_IP} "chmod 644 /usr/local/www/install/fcos/ignition/${CLUSTER_NAME}.${DOMAIN}/*"
278278
${SCP} -r ${WORK_DIR}/ipxe-work-dir/*.ipxe root@${DOMAIN_ROUTER}:/data/tftpboot/ipxe/

0 commit comments

Comments
 (0)