Skip to content
This repository was archived by the owner on Mar 23, 2020. It is now read-only.

Moved OCP post install where it belongs #48

Merged
sreichar merged 1 commit into from
Aug 29, 2019
Merged

Moved OCP post install where it belongs #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: default all OpenShift OCS CNV
.PHONY: default all OpenShift OCS CNV
default: OpenShift bell

all: OpenShift OCS CNV bell
Expand All @@ -12,6 +12,5 @@ OCS: OpenShift
CNV: OpenShift
pushd CNV; ./deploy-cnv.sh; popd


bell:
@echo "Done!" $$'\a'
12 changes: 7 additions & 5 deletions 99_post_install.sh → OpenShift/99_post_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
#!/usr/bin/env bash
set -xe

source logging.sh
source ../common/logging.sh
source common.sh

KUBECONFIG=${KUBECONFIG:-ocp/auth/kubeconfig}
IFCFG_INTERFACE="assets/post-install/ifcfg-interface.template"
IFCFG_BRIDGE="assets/post-install/ifcfg-bridge.template"
POSTINSTALL_ASSETS_DIR="../assets/post-install"
IFCFG_INTERFACE="${POSTINSTALL_ASSETS_DIR}/ifcfg-interface.template"
IFCFG_BRIDGE="${POSTINSTALL_ASSETS_DIR}/ifcfg-bridge.template"
BREXT_FILE="${POSTINSTALL_ASSETS_DIR}/99-brext-master.yaml"

export bridge="${bridge:-brext}"

Expand All @@ -23,7 +25,7 @@ create_bridge(){
echo "Using interface $interface"
export interface_content=$(envsubst < ${IFCFG_INTERFACE} | base64 -w0)
export bridge_content=$(envsubst < ${IFCFG_BRIDGE} | base64 -w0)
envsubst < assets/post-install/99-brext-master.yaml.template > assets/post-install/99-brext-master.yaml
envsubst < ${BREXT_FILE}.template > ${BREXT_FILE}
echo "Done creating bridge definition"
else
echo "Bridge already there!"
Expand All @@ -37,7 +39,7 @@ apply_mc(){

# Apply machine configs
echo "Applying machine configs..."
oc create -f assets/post-install/*-${node_type}.yaml
oc create -f ${POSTINSTALL_ASSETS_DIR}/*-${node_type}.yaml

# Enable auto reboot
oc patch --type=merge --patch='{"spec":{"paused":false}}' machineconfigpool/${node_type}
Expand Down
3 changes: 3 additions & 0 deletions OpenShift/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ requirements:
configure:
./02_configure_host.sh

post_install:
./99_post_install.sh

clean: host_cleanup
Copy link
Collaborator

@sreichar sreichar Aug 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should post install be added to default?

Copy link
Contributor Author

@e-minguez e-minguez Aug 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say to keep it 'manual' yet until something else is needed because the bridge seems to be handled by #47

Copy link
Collaborator

@sreichar sreichar Aug 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After #50 merges, I think we should plumb this to the top level also.


host_cleanup:
Expand Down