Merge "Make repo-setup script name as a parameter"

roles/repo-setup/defaults/main.yml

@@ -1,7 +1,8 @@
 ---
 repo_setup_dir: "{{ working_dir }}"
-repo_setup_script: repo_setup.sh.j2
-repo_setup_log: "{{ repo_setup_dir }}/repo_setup.log"
+repo_setup_script_source: repo_setup.sh.j2
+repo_setup_log: repo_setup.log
+repo_setup_script: repo_setup.sh
 repo_run_live: true
 # Releases shortcuts
 stable:

roles/repo-setup/tasks/inject_repos_into_image.yml

@@ -3,4 +3,4 @@
     name: modify-image
   vars:
     image_to_modify: "{{ repo_inject_image_path }}"
-    modify_script: "{{ repo_setup_dir }}/repo_setup.sh"
+    modify_script: "{{ repo_setup_dir }}/{{ repo_setup_script }}"

roles/repo-setup/tasks/main.yml

@@ -7,8 +7,8 @@
 
 - name: Create repo setup script
   template:
-    src: "{{ repo_setup_script }}"
-    dest: "{{ repo_setup_dir }}/repo_setup.sh"
+    src: "{{ repo_setup_script_source }}"
+    dest: "{{ repo_setup_dir }}/{{ repo_setup_script }}"
     mode: 0755
 
 - include: setup_repos.yml

roles/repo-setup/tasks/setup_repos.yml

@@ -1,7 +1,7 @@
 - name: Setup repos on live host
   shell: >
     set -o pipefail &&
-    {{ repo_setup_dir }}/repo_setup.sh 2>&1 {{ timestamper_cmd }}
-    | tee -a {{ repo_setup_log }}
+    {{ repo_setup_dir }}/{{ repo_setup_script }} 2>&1 {{ timestamper_cmd }}
+    | tee -a {{ repo_setup_dir }}/{{ repo_setup_log }}
   become: true
   no_log: true