diff options
| author | Dan Yocum <dyocum@redhat.com> | 2018-01-24 17:18:39 -0500 |
|---|---|---|
| committer | Dan Yocum <dyocum@redhat.com> | 2018-01-24 17:18:39 -0500 |
| commit | 0dc67b8693d9472f5afb910556e7b86e531cf55c (patch) | |
| tree | 8baf7ca01af89836af32992255220ca70f042464 | |
| parent | 8cbd53ed64f1819b8f4defbf196140a1692c5a42 (diff) | |
| download | openshift-0dc67b8693d9472f5afb910556e7b86e531cf55c.tar.gz openshift-0dc67b8693d9472f5afb910556e7b86e531cf55c.tar.bz2 openshift-0dc67b8693d9472f5afb910556e7b86e531cf55c.tar.xz openshift-0dc67b8693d9472f5afb910556e7b86e531cf55c.zip | |
files in ansible roles do not need to have the path specified to them
when referenced by a builtin module, i.e., copy:
| -rw-r--r-- | roles/openshift_web_console/tasks/install.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_web_console/vars/main.yml | 2 | ||||
| -rw-r--r-- | roles/template_service_broker/tasks/install.yml | 2 | ||||
| -rw-r--r-- | roles/template_service_broker/tasks/remove.yml | 2 | ||||
| -rw-r--r-- | roles/template_service_broker/vars/main.yml | 2 |
5 files changed, 3 insertions, 7 deletions
diff --git a/roles/openshift_web_console/tasks/install.yml b/roles/openshift_web_console/tasks/install.yml index cc5eef47d..ff33338a6 100644 --- a/roles/openshift_web_console/tasks/install.yml +++ b/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 }}" diff --git a/roles/openshift_web_console/vars/main.yml b/roles/openshift_web_console/vars/main.yml index a3e6b8d80..72bff5d01 100644 --- a/roles/openshift_web_console/vars/main.yml +++ b/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" diff --git a/roles/template_service_broker/tasks/install.yml b/roles/template_service_broker/tasks/install.yml index 4e6ad2ae5..d0a07c48d 100644 --- a/roles/template_service_broker/tasks/install.yml +++ b/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 }}" diff --git a/roles/template_service_broker/tasks/remove.yml b/roles/template_service_broker/tasks/remove.yml index 48dc1327e..b46dd4771 100644 --- a/roles/template_service_broker/tasks/remove.yml +++ b/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 }}" diff --git a/roles/template_service_broker/vars/main.yml b/roles/template_service_broker/vars/main.yml index 2512f8b6b..7dec24a79 100644 --- a/roles/template_service_broker/vars/main.yml +++ b/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" |