Export var for size of master in libvirt

Change-Id: I26bbde45098ef888ec930403f398903e91fab823

diff --git a/Makefile b/Makefile
index 46095c9..e94f8fb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,10 @@ ifndef INSTALLER_GIT_TAG
 override INSTALLER_GIT_TAG = "v0.14.0"
 endif
 
+ifndef MASTER_MEMORY_MB
+override MASTER_MEMORY_MB = "11192"
+endif
+
 all: watch
 
 binary:

diff --git a/cmd/generate.go b/cmd/generate.go
index 0e9565a..78db21f 100644 (file)
--- a/cmd/generate.go
+++ b/cmd/generate.go
@@ -36,6 +36,7 @@ var generateCmd = &cobra.Command{
                secretsRepository, _ := cmd.Flags().GetString("secrets_repository")
                siteRepository, _ := cmd.Flags().GetString("site_repository")
                settingsPath, _ := cmd.Flags().GetString("settings_path")
+               masterMemoryMB, _ := cmd.Flags().GetString("master_memory_mb")
 
                // Check if build path exists, create if not
                buildPath, _ := cmd.Flags().GetString("build_path")
@@ -49,7 +50,7 @@ var generateCmd = &cobra.Command{
                }
 
                // start generation process
-               g := generator.New(baseRepo, basePath, installerPath, secretsRepository, siteRepository, settingsPath, buildPath)
+               g := generator.New(baseRepo, basePath, installerPath, secretsRepository, siteRepository, settingsPath, buildPath, masterMemoryMB)
                g.GenerateManifests()
        },
 }
@@ -71,4 +72,7 @@ func init() {
        generateCmd.MarkFlagRequired("site_repository")
        generateCmd.Flags().StringP("settings_path", "", "", "Path to settings.yaml with specific config for the site")
        generateCmd.MarkFlagRequired("settings_path")
+
+       generateCmd.Flags().StringP("master_memory_mb", "", "", "MB of memory to use for master node (libvirt)")
+
 }

diff --git a/pkg/generator/generator.go b/pkg/generator/generator.go
index 33789dd..962ba9f 100644 (file)
--- a/pkg/generator/generator.go
+++ b/pkg/generator/generator.go
@@ -19,19 +19,20 @@ import (
 
 // Generator : Structure that contains the settings needed for generation
 type Generator struct {
-       baseRepo      string
-       basePath      string
-       installerPath string
-       secretsRepo   string
-       siteRepo      string
-       settingsPath  string
-       buildPath     string
-       secrets       map[string]string
+       baseRepo       string
+       basePath       string
+       installerPath  string
+       secretsRepo    string
+       siteRepo       string
+       settingsPath   string
+       buildPath      string
+       masterMemoryMB string
+       secrets        map[string]string
 }
 
 // New constructor for the generator
-func New(baseRepo string, basePath string, installerPath string, secretsRepo string, siteRepo string, settingsPath string, buildPath string) Generator {
-       g := Generator{baseRepo, basePath, installerPath, secretsRepo, siteRepo, settingsPath, buildPath, make(map[string]string)}
+func New(baseRepo string, basePath string, installerPath string, secretsRepo string, siteRepo string, settingsPath string, buildPath string, masterMemoryMB string) Generator {
+       g := Generator{baseRepo, basePath, installerPath, secretsRepo, siteRepo, settingsPath, buildPath, masterMemoryMB, make(map[string]string)}
        return g
 }
 
@@ -239,6 +240,11 @@ func (g Generator) DeployCluster() {
        cmd := exec.Command("./openshift-install", "create", "cluster")
        cmd.Dir = g.buildPath
 
+       if len(g.masterMemoryMB) > 0 {
+               cmd.Env = os.Environ()
+               cmd.Env = append(cmd.Env, fmt.Sprintf("TF_VAR_libvirt_master_memory=%s", g.masterMemoryMB))
+       }
+
        var stdBuffer bytes.Buffer
        mw := io.MultiWriter(os.Stdout, &stdBuffer)
        cmd.Stdout = mw