From df5672b3d9c29b51397f4770eb992c9f3f3955ce Mon Sep 17 00:00:00 2001 From: pmikus Date: Thu, 8 Apr 2021 10:44:18 +0000 Subject: Ansible git move + Better accessibility + Compliant with fdio.infra._function_ - function [pxe|terraform|ansible|vagrant] + dill==0.3.3 also applied on TBs - ci-man to follow today - Docs to be updated in separate patch Signed-off-by: pmikus Change-Id: Iff9eaa29d63044188cc8160db2d9b44b7635782a --- fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf | 4 ++-- fdio.infra.terraform/2n_aws_c5n/main.tf | 4 ++-- fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf | 4 ++-- fdio.infra.terraform/3n_aws_c5n/main.tf | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'fdio.infra.terraform') diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf index 53efe6fb1d..ca974709cd 100644 --- a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf +++ b/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf @@ -50,7 +50,7 @@ variable "first_run_commands" { variable "ansible_file_path" { description = "Path to Ansible playbook" type = string - default = "../../resources/tools/testbed-setup/ansible/site.yaml" + default = "../../fdio.infra.ansible/site.yaml" } variable "ansible_python_executable" { @@ -62,7 +62,7 @@ variable "ansible_python_executable" { variable "ansible_topology_path" { description = "Path to Ansible playbook which creates a topology file" type = string - default = "../../resources/tools/testbed-setup/ansible/cloud_topology.yaml" + default = "../../fdio.infra.ansible/cloud_topology.yaml" } variable "ansible_provision_pwd" { diff --git a/fdio.infra.terraform/2n_aws_c5n/main.tf b/fdio.infra.terraform/2n_aws_c5n/main.tf index 7a090675e7..1aebabd3de 100644 --- a/fdio.infra.terraform/2n_aws_c5n/main.tf +++ b/fdio.infra.terraform/2n_aws_c5n/main.tf @@ -33,8 +33,8 @@ module "deploy" { # Ansible ansible_python_executable = "/usr/bin/python3" - ansible_file_path = "../../resources/tools/testbed-setup/ansible/site.yaml" - ansible_topology_path = "../../resources/tools/testbed-setup/ansible/cloud_topology.yaml" + ansible_file_path = "../../fdio.infra.ansible/site.yaml" + ansible_topology_path = "../../fdio.infra.ansible/cloud_topology.yaml" ansible_provision_pwd = "Csit1234" # First run diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf index 38a9133eeb..5dbc481938 100644 --- a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf +++ b/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf @@ -50,7 +50,7 @@ variable "first_run_commands" { variable "ansible_file_path" { description = "Path to Ansible playbook" type = string - default = "../../resources/tools/testbed-setup/ansible/site.yaml" + default = "../../fdio.infra.ansible/site.yaml" } variable "ansible_python_executable" { @@ -62,7 +62,7 @@ variable "ansible_python_executable" { variable "ansible_topology_path" { description = "Path to Ansible playbook which creates a topology file" type = string - default = "../../resources/tools/testbed-setup/ansible/cloud_topology.yaml" + default = "../../fdio.infra.ansible/cloud_topology.yaml" } variable "ansible_provision_pwd" { diff --git a/fdio.infra.terraform/3n_aws_c5n/main.tf b/fdio.infra.terraform/3n_aws_c5n/main.tf index 0aca7af05a..fca5eecff3 100644 --- a/fdio.infra.terraform/3n_aws_c5n/main.tf +++ b/fdio.infra.terraform/3n_aws_c5n/main.tf @@ -36,8 +36,8 @@ module "deploy" { # Ansible ansible_python_executable = "/usr/bin/python3" - ansible_file_path = "../../resources/tools/testbed-setup/ansible/site.yaml" - ansible_topology_path = "../../resources/tools/testbed-setup/ansible/cloud_topology.yaml" + ansible_file_path = "../../fdio.infra.ansible/site.yaml" + ansible_topology_path = "../../fdio.infra.ansible/cloud_topology.yaml" ansible_provision_pwd = "Csit1234" # First run -- cgit 1.2.3-korg