From 24126aeee45624fe8cc31ec8017e57eb2594391b Mon Sep 17 00:00:00 2001 From: abhijit_onap Date: Tue, 4 Aug 2020 15:10:29 +0530 Subject: [PATCH] Modified to support Prod and Dev Mode Files modified to support installation of platform in production (https) and development (http) mode. Signed-off-by: abhijit_onap Change-Id: I7fd5ce8b95f4d10326fa0cc46bf28aee12f33934 --- ocd/cli/ealt/cmd/init/all.go | 12 +++++++++++- ocd/cli/ealt/cmd/init/edge.go | 10 +++++++++- ocd/cli/ealt/cmd/init/mecm.go | 10 +++++++++- ocd/cli/ealt/cmd/setup/install.go | 19 ++++++++++++++----- 4 files changed, 43 insertions(+), 8 deletions(-) diff --git a/ocd/cli/ealt/cmd/init/all.go b/ocd/cli/ealt/cmd/init/all.go index 915eb5e..061c629 100644 --- a/ocd/cli/ealt/cmd/init/all.go +++ b/ocd/cli/ealt/cmd/init/all.go @@ -17,6 +17,7 @@ package init import ( setup "ealt/cmd/setup" + "strings" "github.com/spf13/cobra" ) @@ -28,12 +29,21 @@ func NewAllCommand() *cobra.Command { Short: "Install Complete EALT Deployment Environment", Long: `Install Complete EALT Deployment Environment`, RunE: func(cmd *cobra.Command, args []string) error { - err := setup.EaltInstall("all") + setupModeFlag := strings.ToLower(cmd.Flag("mode").Value.String()) + var err error + if setupModeFlag == "dev" { + err = setup.EaltInstall("all") + } else if setupModeFlag == "prod" { + err = setup.EaltInstall("secure") + } if err != nil { return err } return nil }, } + cmd.Flags().StringP("mode", "m", "dev", "Deployment Mode") + //cmd.MarkFlagRequired("mode") + return cmd } diff --git a/ocd/cli/ealt/cmd/init/edge.go b/ocd/cli/ealt/cmd/init/edge.go index 8cce554..3b16f93 100644 --- a/ocd/cli/ealt/cmd/init/edge.go +++ b/ocd/cli/ealt/cmd/init/edge.go @@ -17,6 +17,7 @@ package init import ( "fmt" + "strings" setup "ealt/cmd/setup" @@ -30,12 +31,19 @@ func NewEdgeCommand() *cobra.Command { Long: `Command to Install Edge Node only For Example : ealt init edge`, RunE: func(cmd *cobra.Command, args []string) error { fmt.Println("Installation of Edge components") - err := setup.EaltInstall("edge") + setupModeFlag := strings.ToLower(cmd.Flag("mode").Value.String()) + var err error + if setupModeFlag == "dev" { + err = setup.EaltInstall("edge") + } else if setupModeFlag == "prod" { + err = setup.EaltInstall("ssledge") + } if err != nil { return err } return nil }, } + cmd.Flags().StringP("mode", "m", "dev", "Deployment Mode") return cmd } diff --git a/ocd/cli/ealt/cmd/init/mecm.go b/ocd/cli/ealt/cmd/init/mecm.go index 666c308..d67e1c6 100644 --- a/ocd/cli/ealt/cmd/init/mecm.go +++ b/ocd/cli/ealt/cmd/init/mecm.go @@ -17,6 +17,7 @@ package init import ( "ealt/cmd/setup" + "strings" "github.com/spf13/cobra" ) @@ -28,12 +29,19 @@ func NewMecmCommand() *cobra.Command { Short: "Command to install MECM Controller", Long: `Command to Install MECM Controller Node`, RunE: func(cmd *cobra.Command, args []string) error { - err := setup.EaltInstall("mecm") + setupModeFlag := strings.ToLower(cmd.Flag("mode").Value.String()) + var err error + if setupModeFlag == "dev" { + err = setup.EaltInstall("mecm") + } else if setupModeFlag == "prod" { + err = setup.EaltInstall("sslmecm") + } if err != nil { return err } return nil }, } + cmd.Flags().StringP("mode", "m", "dev", "Deployment Mode") return cmd } diff --git a/ocd/cli/ealt/cmd/setup/install.go b/ocd/cli/ealt/cmd/setup/install.go index 2ee636c..1205b27 100644 --- a/ocd/cli/ealt/cmd/setup/install.go +++ b/ocd/cli/ealt/cmd/setup/install.go @@ -19,17 +19,26 @@ import ( "fmt" ) +//Function : Commands for all installation components. +//Depending on the option respective command will be executed. func EaltInstall(component string) error { var strEaltSetup string switch component { case "all": - strEaltSetup = fmt.Sprintf("ansible-playbook ealt-all.yml -i ealt-inventory.ini --extra-vars \"operation=install\"") + strEaltSetup = fmt.Sprintf("ansible-playbook ealt-all.yml -i ealt-inventory.ini --extra-vars \"operation=install mode=dev\"") + // Production Mode : SSL Mode Installation Command. + case "sslall": + strEaltSetup = fmt.Sprintf("ansible-playbook ealt-all.yml -i ealt-inventory.ini --extra-vars \"operation=install mode=prod\"") case "infra": strEaltSetup = fmt.Sprintf("ansible-playbook ealt-all.yml -i ealt-inventory.ini --tags \"infra\" --extra-vars \"operation=install\"") - case "manager": - strEaltSetup = fmt.Sprintf("ansible-playbook ealt-all.yml -i ealt-inventory.ini --tags \"mecm\" --extra-vars \"operation=install\"") + case "mecm": + strEaltSetup = fmt.Sprintf("ansible-playbook ealt-all.yml -i ealt-inventory.ini --tags \"mecm\" --extra-vars \"operation=install mode=dev\"") + case "sslmecm": + strEaltSetup = fmt.Sprintf("ansible-playbook ealt-all.yml -i ealt-inventory.ini --tags \"mecm\" --extra-vars \"operation=install mode=prod\"") case "edge": - strEaltSetup = fmt.Sprintf("ansible-playbook ealt-all.yml -i ealt-inventory.ini --tags \"mep\" --extra-vars \"operation=install\"") + strEaltSetup = fmt.Sprintf("ansible-playbook ealt-all.yml -i ealt-inventory.ini --tags \"mep\" --extra-vars \"operation=install mode=dev\"") + case "ssledge": + strEaltSetup = fmt.Sprintf("ansible-playbook ealt-all.yml -i ealt-inventory.ini --tags \"mep\" --extra-vars \"operation=install mode=prod\"") case "k8s": strEaltSetup = fmt.Sprintf("ansible-playbook ealt-all.yml -i ealt-inventory.ini --tags \"k8s\" --extra-vars \"operation=install\"") case "k3s": @@ -59,7 +68,7 @@ func EaltReset(component string) error { case "edge": strEaltReset = fmt.Sprintf("ansible-playbook ealt-all-uninstall.yml -i ealt-inventory.ini --tags \"mep\" --extra-vars \"operation=uninstall\"") case "k8s": - strEaltReset = fmt.Sprintf("ansible-playbook ealt-all-uninstall.yml -i ealt-inventory.ini --tags \"k8s\" --extra-vars \"operation=uninstall\"") + strEaltReset = fmt.Sprintf("cd ~/kubespray && yes | ansible-playbook -i inventory/mycluster/hosts.yaml --user root reset.yml") case "k3s": strEaltReset = fmt.Sprintf("ansible-playbook ealt-all-uninstall.yml -i ealt-inventory.ini --tags \"k3s\" --extra-vars \"operation=uninstall\"") default: -- 2.16.6