Drop OCP and root Makefiles in favor of openshift-kni#54, rename targets in OCS/CNV Makefiles

johnbieren · johnbieren · commit c0b471dabb96 · 2019-08-30T10:14:15.000-04:00
Signed-off-by: Johnny Bieren &lt;jbieren@redhat.com&gt;
diff --git a/CNV/Makefile b/CNV/Makefile
@@ -1,7 +1,10 @@
-.PHONY: all run upgrade
-all: run
+.PHONY: default all deploy upgrade
 
-run:
+default: deploy
+
+all: deploy
+
+deploy:
 	./cnv-2.1.0.sh
 
 upgrade:
diff --git a/Makefile b/Makefile
@@ -6,14 +6,11 @@ all: OpenShift OCS CNV bell
 OpenShift:
 	pushd OpenShift; make; popd
 
-OpenShift-virt:
-	pushd OpenShift; make pre_install; make all; popd
-
 OCS: OpenShift
-	pushd OCS; make; popd
+	pushd OCS; ./customize-ocs.sh; popd
 
 CNV: OpenShift
-	pushd CNV; make; popd
+	pushd CNV; ./deploy-cnv.sh; popd
 
 bell:
 	@echo "Done!" $$'\a'
diff --git a/OCS/Makefile b/OCS/Makefile
@@ -1,5 +1,8 @@
-.PHONY: all run
-all: run
+.PHONY: default all deploy
 
-run:
+default: deploy
+
+all: deploy
+
+deploy:
 	./customize-ocs.sh
diff --git a/OpenShift/Makefile b/OpenShift/Makefile
@@ -1,19 +1,14 @@
 .PHONY: default all requirements configure
 default: requirements configure
 
-all: cluster post_install
+all: default
 
 requirements:
 	./01_install_requirements.sh
 
 configure:
 	./02_configure_host.sh
 
-pre_install: requirements configure
-
-cluster:
-	./03_create_cluster.sh
-
 post_install:
 	./99_post_install.sh
 
