refactor: move ANSIBLE_CONFIG env up

controlplaneio · Jan 10, 2024 · 7b0258b · 7b0258b
1 parent 394efa6
commit 7b0258b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/cmd/container/main.go b/cmd/container/main.go
@@ -18,6 +18,7 @@ func main() {
 	adminBundleDir := filepath.Join(simulatorDir, "config", "admin")
 	packerDir := filepath.Join(simulatorDir, "packer")
 	terraformWorkspaceDir := filepath.Join(simulatorDir, "terraform/workspaces/simulator")
+	ansibleConfigPath := filepath.Join(adminBundleDir, "ansible.cfg")
 	ansiblePlaybookDir := filepath.Join(simulatorDir, "ansible/playbooks")
 
 	conf := config.Config{}
@@ -39,7 +40,10 @@ func main() {
 	scenarioManager := tools.AnsiblePlaybook{
 		WorkingDir:  adminBundleDir,
 		PlaybookDir: ansiblePlaybookDir,
-		Output:      os.Stdout,
+		// Ansible complains on Windows+WSL that the directory ansible configuration is world writable
+		// and hence ignore the configuration unless explicitly set using the ANSIBLE_CONFIG environment variable.
+		Env:    []string{"ANSIBLE_CONFIG=" + ansibleConfigPath},
+		Output: os.Stdout,
 	}
 
 	withStateBucketFlag := cli.WithFlag("stateBucket", "", "the name of the S3 bucket to store Terraform state")

diff --git a/core/tools/ansible.go b/core/tools/ansible.go
@@ -11,7 +11,6 @@ import (
 
 const (
 	AnsiblePlaybookExecutable Executable = "ansible-playbook"
-	AnsibleConfigPath         string     = "/simulator/config/admin/ansible.cfg"
 )
 
 type ScenarioManager interface {
@@ -22,13 +21,14 @@ type ScenarioManager interface {
 type AnsiblePlaybook struct {
 	WorkingDir  string
 	PlaybookDir string
+	Env         []string
 	Output      io.Writer
 }
 
 func (p AnsiblePlaybook) Install(ctx context.Context, id string) error {
 	playbook := fmt.Sprintf("%s.yaml", id)
 
-	if err := ansiblePlaybookCommand(p.WorkingDir, p.PlaybookDir, playbook).Run(ctx, p.Output); err != nil {
+	if err := ansiblePlaybookCommand(p.WorkingDir, p.PlaybookDir, p.Env, playbook).Run(ctx, p.Output); err != nil {
 		return fmt.Errorf("failed to execute Ansible Playbook: %w", err)
 	}
 
@@ -38,15 +38,15 @@ func (p AnsiblePlaybook) Install(ctx context.Context, id string) error {
 func (p AnsiblePlaybook) Uninstall(ctx context.Context, id string) error {
 	playbook := fmt.Sprintf("%s.yaml", id)
 
-	if err := ansiblePlaybookCommand(p.WorkingDir, p.PlaybookDir, playbook, "state=absent").
+	if err := ansiblePlaybookCommand(p.WorkingDir, p.PlaybookDir, p.Env, playbook, "state=absent").
 		Run(ctx, p.Output); err != nil {
 		return fmt.Errorf("failed to run Ansible Playbook with state=absent: %w", err)
 	}
 
 	return nil
 }
 
-func ansiblePlaybookCommand(workingDir, playbookDir, playbook string, extraVars ...string) runner {
+func ansiblePlaybookCommand(workingDir, playbookDir string, env []string, playbook string, extraVars ...string) runner {
 	args := []string{
 		fmt.Sprintf("%s/%s", playbookDir, playbook),
 	}
@@ -62,11 +62,7 @@ func ansiblePlaybookCommand(workingDir, playbookDir, playbook string, extraVars
 		Executable: AnsiblePlaybookExecutable,
 		WorkingDir: workingDir,
 		Arguments:  args,
-		// Ansible complains on Windows+WSL that the directory
-		// with the ansible configuration is world writable
-		// and hence ignore the configuration unless explicitly
-		// set using the ANSIBLE_CONFIG environment variable.
-		Env: []string{"ANSIBLE_CONFIG=" + AnsibleConfigPath},
+		Env:        env,
 	}
 }