From 410e18ee63571c85769273fd613147fef44088af Mon Sep 17 00:00:00 2001
From: Steve Reichard <sreichar@redhat.com>
Date: Mon, 26 Aug 2019 14:35:33 -0400
Subject: [PATCH] Slight reconfig - move Openshift install to a subdirectory

---
 Makefile                                      | 19 +++++++++----------
 .../01_install_requirements.sh                |  2 +-
 .../02_configure_host.sh                      |  2 +-
 .../03_create_cluster.sh                      |  2 +-
 OpenShift/Makefile                            | 18 ++++++++++++++++++
 common.sh => OpenShift/common.sh              |  0
 .../config_example.sh                         |  0
 .../gen_metal3_config.sh                      |  0
 host_cleanup.sh => OpenShift/host_cleanup.sh  |  2 +-
 logging.sh => common/logging.sh               |  0
 10 files changed, 31 insertions(+), 14 deletions(-)
 rename 01_install_requirements.sh => OpenShift/01_install_requirements.sh (97%)
 rename 02_configure_host.sh => OpenShift/02_configure_host.sh (99%)
 rename 03_create_cluster.sh => OpenShift/03_create_cluster.sh (98%)
 create mode 100644 OpenShift/Makefile
 rename common.sh => OpenShift/common.sh (100%)
 rename config_example.sh => OpenShift/config_example.sh (100%)
 rename gen_metal3_config.sh => OpenShift/gen_metal3_config.sh (100%)
 rename host_cleanup.sh => OpenShift/host_cleanup.sh (95%)
 rename logging.sh => common/logging.sh (100%)
 mode change 100644 => 100755

diff --git a/Makefile b/Makefile
index 82dce1a..7afc63c 100644
--- a/Makefile
+++ b/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 --git a/01_install_requirements.sh b/OpenShift/01_install_requirements.sh
similarity index 97%
rename from 01_install_requirements.sh
rename to OpenShift/01_install_requirements.sh
index 9912f92..a598d89 100755
--- a/01_install_requirements.sh
+++ b/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 --git a/02_configure_host.sh b/OpenShift/02_configure_host.sh
similarity index 99%
rename from 02_configure_host.sh
rename to OpenShift/02_configure_host.sh
index cd1be83..5eb3a21 100755
--- a/02_configure_host.sh
+++ b/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 --git a/03_create_cluster.sh b/OpenShift/03_create_cluster.sh
similarity index 98%
rename from 03_create_cluster.sh
rename to OpenShift/03_create_cluster.sh
index 9929e73..4c92a51 100755
--- a/03_create_cluster.sh
+++ b/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 --git a/OpenShift/Makefile b/OpenShift/Makefile
new file mode 100644
index 0000000..82dce1a
--- /dev/null
+++ b/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 --git a/common.sh b/OpenShift/common.sh
similarity index 100%
rename from common.sh
rename to OpenShift/common.sh
diff --git a/config_example.sh b/OpenShift/config_example.sh
similarity index 100%
rename from config_example.sh
rename to OpenShift/config_example.sh
diff --git a/gen_metal3_config.sh b/OpenShift/gen_metal3_config.sh
similarity index 100%
rename from gen_metal3_config.sh
rename to OpenShift/gen_metal3_config.sh
diff --git a/host_cleanup.sh b/OpenShift/host_cleanup.sh
similarity index 95%
rename from host_cleanup.sh
rename to OpenShift/host_cleanup.sh
index 40348f3..8de73d7 100755
--- a/host_cleanup.sh
+++ b/OpenShift/host_cleanup.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
diff --git a/logging.sh b/common/logging.sh
old mode 100644
new mode 100755
similarity index 100%
rename from logging.sh
rename to common/logging.sh