From 569fb1f150880cafa87e1025c51631cf47056431 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Mon, 14 Mar 2022 01:01:28 -0400 Subject: [PATCH] variablize no_log because we can. also fixed the gitlab pat - there was an uknown issue with the other --- inmem-test.yml | 16 ++++++++-------- vars/defaults.yml | 5 ++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/inmem-test.yml b/inmem-test.yml index 1c98d1b..46dab2c 100644 --- a/inmem-test.yml +++ b/inmem-test.yml @@ -53,7 +53,7 @@ - name : "Test #2: Launch the `file_removal_test` job template" - no_log : yes + no_log : "{{ __no_log | default('yes') }}" uri : url : "{{ tower_file_remove_url }}" force_basic_auth : yes @@ -68,7 +68,7 @@ - name : Return job data to originating source - no_log : yes + no_log : "{{ __no_log | default('yes') }}" uri : url : "{{ gitlab_commit_url }}" headers : @@ -111,9 +111,9 @@ msg : "*** EXCEPTION CAUGHT; RUNNING RESCUE TASKS ***" - - name: "Create missing file on {{ inventory_hostname }}" - #no_log : yes - uri: + - name : "Create missing file on {{ inventory_hostname }}" + no_log : "{{ __no_log | default('yes') }}" + uri : url : "{{ tower_file_creation_url }}" force_basic_auth : yes user : "{{ tower_user }}" @@ -126,9 +126,9 @@ tower_provision_host: "{{ inventory_hostname }}" - - name: Return job data to originating source - no_log : no - uri: + - name : Return job data to originating source + no_log : "{{ __no_log | default('yes') }}" + uri : url : "{{ gitlab_commit_url }}" headers : PRIVATE-TOKEN : "{{ gitlab_pat }}" diff --git a/vars/defaults.yml b/vars/defaults.yml index 48afc23..5096731 100644 --- a/vars/defaults.yml +++ b/vars/defaults.yml @@ -2,6 +2,9 @@ check_file: /tmp/hello-ansible.txt +__no_log: yes + + tower_url : 'https://tower2.thezengarden.net' tower_user : admin tower_password : redhat @@ -15,7 +18,7 @@ tower_file_creation_url : "{{ tower_url }}/api/v2/job_templates/\ gitlab_url : 'https://git.thezengarden.net' gitlab_proj_id : 119 -gitlab_pat : "glpat-PG-6dGDyTnt9guvxyhzS" +gitlab_pat : "glpat-Cg3ibBo6G39d_QZP9cHe" gitlab_commit_url : "{{ gitlab_url }}/api/v4/projects/{{ gitlab_proj_id }}\ /repository/commits"