From b5527ad125e80eb83376c7e943ea21eadc6ee75b Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 19 Nov 2019 14:21:48 +0100 Subject: [PATCH] copr: provide vars file for aws playbooks --- roles/copr/backend/files/provision/builderpb-aws-x86_64.yml | 2 ++ roles/copr/backend/tasks/main.yml | 1 + roles/copr/backend/tasks/resalloc.yml | 1 + roles/copr/backend/templates/provision/aws_cloud_vars.yml | 2 ++ roles/copr/backend/templates/provision/vars.yml | 3 ++- 5 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 roles/copr/backend/templates/provision/aws_cloud_vars.yml diff --git a/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml b/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml index a8d89d9418..9c307f63a7 100644 --- a/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml +++ b/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml @@ -4,6 +4,7 @@ vars_files: - vars.yml + - aws_cloud_vars.yml vars: keypair: copr-builder @@ -62,6 +63,7 @@ vars_files: - vars.yml + - aws_cloud_vars.yml vars: ansible_python_interpreter: /usr/bin/python3 diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 7236b68984..6de7b3f0fc 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -176,6 +176,7 @@ with_items: - vars.yml - nova_cloud_vars.yml + - aws_cloud_vars.yml tags: - provision_config diff --git a/roles/copr/backend/tasks/resalloc.yml b/roles/copr/backend/tasks/resalloc.yml index b481fe38fb..055d044fc1 100644 --- a/roles/copr/backend/tasks/resalloc.yml +++ b/roles/copr/backend/tasks/resalloc.yml @@ -60,6 +60,7 @@ with_items: - vars.yml - nova_cloud_vars.yml + - aws_cloud_vars.yml tags: - provision_config diff --git a/roles/copr/backend/templates/provision/aws_cloud_vars.yml b/roles/copr/backend/templates/provision/aws_cloud_vars.yml new file mode 100644 index 0000000000..25ea8ea29b --- /dev/null +++ b/roles/copr/backend/templates/provision/aws_cloud_vars.yml @@ -0,0 +1,2 @@ +builder_images: + x86_64: "{{ copr_builder_images.aws.x86_64 }}" diff --git a/roles/copr/backend/templates/provision/vars.yml b/roles/copr/backend/templates/provision/vars.yml index 7945384879..ecaa38465e 100644 --- a/roles/copr/backend/templates/provision/vars.yml +++ b/roles/copr/backend/templates/provision/vars.yml @@ -1,4 +1,5 @@ --- devel: {% if devel %}true{% else %}false{% endif %} + {# 2015-07-09T16:59:26.896629Z => 20150709_165926_896629 #} -builder_uniq_suffix: "\{\{ ansible_date_time.iso8601_micro | regex_replace('[-:Z]', '') | regex_replace('[T\\.]', '_') }}" +builder_uniq_suffix: "{{ '{{' }} ansible_date_time.iso8601_micro | regex_replace('[-:Z]', '') | regex_replace('[T\\.]', '_') }}"