From 7b0258bc6fc119688f6ce55e56d0530eb6f44492 Mon Sep 17 00:00:00 2001 From: Ric Featherstone Date: Mon, 8 Jan 2024 18:29:01 +0000 Subject: [PATCH] refactor: move ANSIBLE_CONFIG env up --- cmd/container/main.go | 6 +++++- core/tools/ansible.go | 14 +++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/container/main.go b/cmd/container/main.go index 3571587f..8a546836 100644 --- 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 index 50b7ad23..96f0d047 100644 --- 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,7 +38,7 @@ 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) } @@ -46,7 +46,7 @@ func (p AnsiblePlaybook) Uninstall(ctx context.Context, id string) error { 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, } }