From 318878d4de7e9daccac90aa9497572959fce061e Mon Sep 17 00:00:00 2001 From: Symanovich Siarhei Date: Mon, 2 Sep 2019 17:53:21 +0300 Subject: [PATCH] accept empty env_vars with enter key, minor changes --- host_vars/blockscout.yml.example | 1 - roles/main_software/tasks/main.yml | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/host_vars/blockscout.yml.example b/host_vars/blockscout.yml.example index 1d3ffc2..23669de 100644 --- a/host_vars/blockscout.yml.example +++ b/host_vars/blockscout.yml.example @@ -1,6 +1,5 @@ skip_fetch: false -blockscout_repo: https://github.com/poanetwork/blockscout branch: "production-core" #merge_commit: "2cdead1" ps_db: mydb # The name of the test DB to store data in; diff --git a/roles/main_software/tasks/main.yml b/roles/main_software/tasks/main.yml index 3296f2b..983e699 100644 --- a/roles/main_software/tasks/main.yml +++ b/roles/main_software/tasks/main.yml @@ -223,13 +223,13 @@ - name: User prompt pause: - prompt: "Would you like to remove staging dependencies? [Yes/No]" + prompt: "Would you like to remove staging dependencies? [Yes[Enter]/No]" register: user_answer until: user_answer.user_input | lower in conditional retries: 10000 delay: 1 vars: - conditional: ['yes','no','true','false'] + conditional: ["",'yes','no','true','false'] when: inventory_hostname == groups['all'][0] tags: - build @@ -258,7 +258,7 @@ - name: User prompt pause: - prompt: "Do you want to update the Parameter Store variables? [Yes/No]" + prompt: "Do you want to update the Parameter Store variables? [Yes[Enter]/No]" register: user_answer until: user_answer.user_input | lower in conditional retries: 10000 @@ -282,14 +282,14 @@ secret_key: "{{ aws_secret_key|default(omit) }}" profile: "{{ aws_profile|default(omit) }}" region: "{{ aws_region|default(omit) }}" - with_dict: "{{ lower_env }}" + with_dict: "{{ lower_env | default({}) }}" when: hostvars[groups['all'][0]].user_answer.user_input == "" or hostvars[groups['all'][0]].user_answer.user_input | lower | bool tags: - update_vars - name: User prompt pause: - prompt: "Do you want to deploy BlockScout? [Yes/No]" + prompt: "Do you want to deploy BlockScout? [Yes[Enter]/No]" register: user_answer until: user_answer.user_input | lower in conditional retries: 10000