Capture creation of cluster into Helm chart

[icn.git] / Makefile

diff --git a/Makefile b/Makefile
index b02b771..6ed7b15 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ install: jump_server \
 jump_server: package_prerequisite \
        kud_bm_deploy_mini \
        bmh_install \
+       capi_install \
        bpa_op_install \
        bpa_rest_api_install
 
@@ -31,8 +32,8 @@ package_prerequisite:
 
 bmh_clean:
        pushd $(METAL3DIR) && ./01_metal3.sh deprovision && \
-       ./03_verify_deprovisioning.sh && ./01_metal3.sh clean && \
-        ./01_metal3.sh remove && popd
+       ./03_verify_deprovisioning.sh && ./01_metal3.sh clean && popd && \
+       ./deploy/baremetal-operator/baremetal-operator.sh clean
 
 bmh_clean_host:
        pushd $(BMDIR) && ./06_host_cleanup.sh && popd
@@ -47,12 +48,12 @@ clean_bm_packages:
 
 bmh_preinstall:
        source user_config.sh && env && \
-       pushd $(BMDIR) && ./02_configure.sh && \
-       ./03_launch_prereq.sh && popd
+       pushd $(BMDIR) && ./02_configure.sh && popd && \
+       ./deploy/ironic/ironic.sh deploy
 
 bmh_install: bmh_preinstall
-       source user_config.sh && env && \
-       pushd $(METAL3DIR) && ./01_metal3.sh launch && popd
+       ./deploy/cert-manager/cert-manager.sh deploy && \
+       ./deploy/baremetal-operator/baremetal-operator.sh deploy
 
 bmh_provision:
        source user_config.sh && env && \
@@ -87,6 +88,9 @@ kud_bm_reset:
 sdwan_verifier:
        pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd
 
+capi_install:
+       ./deploy/cluster-api/cluster-api.sh deploy
+
 bpa_op_install:
        pushd $(BPA_OPERATOR) && make docker && make deploy && popd