From df25051e3a9b5d8860346ad9f6ac62170fda76c4 Mon Sep 17 00:00:00 2001 From: Johnny Bieren Date: Wed, 28 Aug 2019 10:45:35 -0400 Subject: [PATCH 1/3] Add Makefiles to CNV and OCS directories Signed-off-by: Johnny Bieren --- CNV/Makefile | 8 ++++++++ Makefile | 4 ++-- OCS/Makefile | 5 +++++ 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 CNV/Makefile create mode 100644 OCS/Makefile diff --git a/CNV/Makefile b/CNV/Makefile new file mode 100644 index 0000000..a824977 --- /dev/null +++ b/CNV/Makefile @@ -0,0 +1,8 @@ +.PHONY: all run upgrade +all: run + +run: + ./cnv-2.1.0.sh + +upgrade: + ./cnv-upgrade.sh diff --git a/Makefile b/Makefile index bd332ca..2265932 100644 --- a/Makefile +++ b/Makefile @@ -7,10 +7,10 @@ OpenShift: pushd OpenShift; make; popd OCS: OpenShift - pushd OCS; ./customize-ocs.sh; popd + pushd OCS; make; popd CNV: OpenShift - pushd CNV; ./deploy-cnv.sh; popd + pushd CNV; make; popd bell: @echo "Done!" $$'\a' diff --git a/OCS/Makefile b/OCS/Makefile new file mode 100644 index 0000000..87b3d6c --- /dev/null +++ b/OCS/Makefile @@ -0,0 +1,5 @@ +.PHONY: all run +all: run + +run: + ./customize-ocs.sh From 7508094b520432ed5ff60e7e90674934a9a0b76c Mon Sep 17 00:00:00 2001 From: Johnny Bieren Date: Fri, 30 Aug 2019 08:46:54 -0400 Subject: [PATCH 2/3] Also modify OpenShift Makefile Signed-off-by: Johnny Bieren --- Makefile | 3 +++ OpenShift/Makefile | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2265932..13d9acb 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,9 @@ 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 diff --git a/OpenShift/Makefile b/OpenShift/Makefile index 2e32074..75e62e5 100644 --- a/OpenShift/Makefile +++ b/OpenShift/Makefile @@ -1,7 +1,7 @@ .PHONY: default all requirements configure default: requirements configure -all: default +all: cluster post_install requirements: ./01_install_requirements.sh @@ -9,6 +9,11 @@ requirements: configure: ./02_configure_host.sh +pre_install: requirements configure + +cluster: + ./03_create_cluster.sh + post_install: ./99_post_install.sh From c0b471dabb9677a47a6adc6077f21eb6ced65488 Mon Sep 17 00:00:00 2001 From: Johnny Bieren Date: Fri, 30 Aug 2019 10:14:15 -0400 Subject: [PATCH 3/3] Drop OCP and root Makefiles in favor of #54, rename targets in OCS/CNV Makefiles Signed-off-by: Johnny Bieren --- CNV/Makefile | 9 ++++++--- Makefile | 7 ++----- OCS/Makefile | 9 ++++++--- OpenShift/Makefile | 7 +------ 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/CNV/Makefile b/CNV/Makefile index a824977..c17958e 100644 --- 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 index 13d9acb..bd332ca 100644 --- 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 index 87b3d6c..4314769 100644 --- 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 index 75e62e5..2e32074 100644 --- a/OpenShift/Makefile +++ b/OpenShift/Makefile @@ -1,7 +1,7 @@ .PHONY: default all requirements configure default: requirements configure -all: cluster post_install +all: default requirements: ./01_install_requirements.sh @@ -9,11 +9,6 @@ requirements: configure: ./02_configure_host.sh -pre_install: requirements configure - -cluster: - ./03_create_cluster.sh - post_install: ./99_post_install.sh