Browse Source

files in ansible roles do not need to have the path specified to them
when referenced by a builtin module, i.e., copy:

Dan Yocum 7 years ago
parent
commit
0dc67b8693

+ 1 - 1
roles/openshift_web_console/tasks/install.yml

@@ -33,7 +33,7 @@
 
 - name: Copy web console templates to temp directory
   copy:
-    src: "{{ __console_files_location }}/{{ item }}"
+    src: "{{ item }}"
     dest: "{{ mktemp.stdout }}/{{ item }}"
   with_items:
     - "{{ __console_template_file }}"

+ 0 - 2
roles/openshift_web_console/vars/main.yml

@@ -1,6 +1,4 @@
 ---
-__console_files_location: "../files/"
-
 __console_template_file: "console-template.yaml"
 __console_rbac_file: "console-rbac-template.yaml"
 __console_config_file: "console-config.yaml"

+ 1 - 1
roles/template_service_broker/tasks/install.yml

@@ -28,7 +28,7 @@
   changed_when: false
 
 - copy:
-    src: "{{ __tsb_files_location }}/{{ item }}"
+    src: "{{ item }}"
     dest: "{{ mktemp.stdout }}/{{ item }}"
   with_items:
     - "{{ __tsb_template_file }}"

+ 1 - 1
roles/template_service_broker/tasks/remove.yml

@@ -9,7 +9,7 @@
   changed_when: false
 
 - copy:
-    src: "{{ __tsb_files_location }}/{{ item }}"
+    src: "{{ item }}"
     dest: "{{ mktemp.stdout }}/{{ item }}"
   with_items:
   - "{{ __tsb_template_file }}"

+ 0 - 2
roles/template_service_broker/vars/main.yml

@@ -1,6 +1,4 @@
 ---
-__tsb_files_location: "../files/"
-
 __tsb_template_file: "apiserver-template.yaml"
 __tsb_config_file: "apiserver-config.yaml"
 __tsb_rbac_file: "rbac-template.yaml"