From 0e1822c79f995e44cea5115f99e92316c34b1630 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Mon, 2 May 2022 14:05:51 -0400 Subject: [PATCH] add split-host-job-launch.yml test; various fixes and modifications --- file-creation-single.yml | 7 +------ inventory/hosts | 12 ++++++------ split-host-job-launch.yml | 31 +++++++++++++++++++++++++++++++ utils/dev_tower_test.sh | 0 utils/dev_tower_test_2.sh | 0 utils/tower_test.sh | 2 +- vars/defaults.yml | 2 +- 7 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 split-host-job-launch.yml mode change 100644 => 100755 utils/dev_tower_test.sh mode change 100644 => 100755 utils/dev_tower_test_2.sh diff --git a/file-creation-single.yml b/file-creation-single.yml index 1b0b2f0..71ce9c0 100644 --- a/file-creation-single.yml +++ b/file-creation-single.yml @@ -10,12 +10,7 @@ vars: - lab_tower_hosts: - - lab-dev-1 - - lab-dev-2 - - lab-prod-1 - - lab-prod-2 - provision_host : "{{ tower_provision_host | default(lab_tower_hosts | random) }}" + provision_host : "{{ tower_provision_host | default(ansible_play_hosts | random) }}" tasks: diff --git a/inventory/hosts b/inventory/hosts index 4ee84e9..178b024 100644 --- a/inventory/hosts +++ b/inventory/hosts @@ -3,8 +3,8 @@ lab-dev-1 lab-dev-2 lab-dev-3 -[dev:vars] -ansible_python_interpreter=/usr/bin/python2 +#[dev:vars] +#ansible_python_interpreter=/usr/bin/python2 [test] @@ -12,8 +12,8 @@ lab-test-1 lab-test-2 lab-test-3 -[test:vars] -ansible_python_interpreter=/usr/bin/python3 +#[test:vars] +#ansible_python_interpreter=/usr/bin/python3 [prod] @@ -21,8 +21,8 @@ lab-prod-1 lab-prod-2 lab-prod-3 -[prod:vars] -ansible_python_interpreter=/usr/bin/python3 +#[prod:vars] +#ansible_python_interpreter=/usr/bin/python3 [all:vars] diff --git a/split-host-job-launch.yml b/split-host-job-launch.yml new file mode 100644 index 0000000..91c11a6 --- /dev/null +++ b/split-host-job-launch.yml @@ -0,0 +1,31 @@ +--- +- name: Split up hosts into single job runs + hosts: all + connection: local + become: yes + gather_facts: no + + + vars_files: + - vars/defaults.yml + + + tasks: + - name: Launch job per each host + no_log : "{{ __no_log | default('yes') }}" + uri : + url : "{{ tower_file_creation_url }}" + force_basic_auth : yes + user : "{{ tower_user }}" + password : "{{ tower_password }}" + body_format : json + method : POST + status_code : 201 + body: + extra_vars: + tower_provision_host: "{{ item }}" + loop: "{{ ansible_play_hosts }}" + run_once: yes + + +... diff --git a/utils/dev_tower_test.sh b/utils/dev_tower_test.sh old mode 100644 new mode 100755 diff --git a/utils/dev_tower_test_2.sh b/utils/dev_tower_test_2.sh old mode 100644 new mode 100755 diff --git a/utils/tower_test.sh b/utils/tower_test.sh index 465eb11..aab10df 100755 --- a/utils/tower_test.sh +++ b/utils/tower_test.sh @@ -5,7 +5,7 @@ REQU="150" SLEEP_SECS="400" BASE_URL="tower2.thezengarden.net" -AAP_JOB_ID="26" +AAP_JOB_ID="36" POST_PAYLOAD_PATH="empty.post" POST_PAYLOAD_TYPE="application/json" diff --git a/vars/defaults.yml b/vars/defaults.yml index 5096731..19b9b85 100644 --- a/vars/defaults.yml +++ b/vars/defaults.yml @@ -9,7 +9,7 @@ tower_url : 'https://tower2.thezengarden.net' tower_user : admin tower_password : redhat tower_file_removal_template : 13 -tower_file_creation_template : 12 +tower_file_creation_template : 44 tower_file_remove_url : "{{ tower_url }}/api/v2/job_templates/\ {{ tower_file_removal_template }}/launch/" tower_file_creation_url : "{{ tower_url }}/api/v2/job_templates/\