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

Slight reconfig - move Openshift install to a subdirectory #41

Merged
rlopez133 merged 1 commit into from
Aug 28, 2019
Merged

Slight reconfig - move Openshift install to a subdirectory #41

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
19 changes: 9 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
.PHONY: default all requirements configure
default: requirements configure
.PHONY: default all OpenShift OCS CNV
default: OpenShift bell

all: default
all: OpenShift OCS CNV bell

requirements:
./01_install_requirements.sh
OpenShift:
pushd Openshift; make; popd

configure:
./02_configure_host.sh
OCS: OpenShift
pushd OCS; ./customize-ocs.sh; popd

clean: host_cleanup
CNV: OpenShift
pushd CNV; ./deploy-cnv.sh; popd

host_cleanup:
./host_cleanup.sh

bell:
@echo "Done!" $$'\a'
2 changes: 1 addition & 1 deletion 01_install_requirements.sh → OpenShift/01_install_requirements.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -ex

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

# FIXME: include checks from common.sh, see https://github.com/openshift-metal3/dev-scripts/issues/727

Expand Down
2 changes: 1 addition & 1 deletion 02_configure_host.sh → OpenShift/02_configure_host.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -xe

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

# FIXME: we don't generate a user SSH key - check for one?
Expand Down
2 changes: 1 addition & 1 deletion 03_create_cluster.sh → OpenShift/03_create_cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -xe

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

export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE:-registry.svc.ci.openshift.org/ocp/release:4.2}"
Expand Down
18 changes: 18 additions & 0 deletions OpenShift/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
.PHONY: default all requirements configure
default: requirements configure

all: default

requirements:
./01_install_requirements.sh

configure:
./02_configure_host.sh

clean: host_cleanup

host_cleanup:
./host_cleanup.sh

bell:
@echo "Done!" $$'\a'
0 common.sh → OpenShift/common.sh
View file
Open in desktop
File renamed without changes.
0 config_example.sh → OpenShift/config_example.sh
View file
Open in desktop
File renamed without changes.
0 gen_metal3_config.sh → OpenShift/gen_metal3_config.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion host_cleanup.sh → OpenShift/host_cleanup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -x

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

if virsh net-uuid baremetal > /dev/null 2>&1 ; then
Expand Down
0 logging.sh → common/logging.sh
100644 → 100755
View file
Open in desktop
File renamed without changes.