Slight reconfig - move Openshift install to a subdirectory

Author: sreichar

Diff for: Makefile

@@ -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'

Diff for: 01_install_requirements.sh renamed to OpenShift/01_install_requirements.sh

@@ -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
 

Diff for: 02_configure_host.sh renamed to OpenShift/02_configure_host.sh

@@ -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?

Diff for: 03_create_cluster.sh renamed to OpenShift/03_create_cluster.sh

@@ -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}"

Diff for: OpenShift/Makefile

@@ -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'

Diff for: common.sh renamed to OpenShift/common.sh

@@ -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