Fixed issues with finding files.
diff --git a/installations/aio/clean.yml b/installations/aio/clean.yml index 72ff1ad..2419405 100644 --- a/installations/aio/clean.yml +++ b/installations/aio/clean.yml
@@ -1,17 +1,18 @@ --- - hosts: localhost connection: local - tasks: - - name: Remove .ansible_cache + - name: Clean files + async: 0 + poll: 0 + ignore_errors: yes file: path: '{{ item }}' state: absent - force: yes with_items: - '~/.ansible/tmp/cache' - '~/.ansible/tmp/ansible.log' - - 'ssh_keys' - - 'configs_and_logs' - - 'rpm_resources' + - '~/.apigee/ssh_keys' + - '~/.apigee/logs' + - '~/.apigee/configs'
diff --git a/installations/aio/components/opdk-install-component.yml b/installations/aio/components/opdk-install-component.yml index 902f4b9..c2b5cd2 100644 --- a/installations/aio/components/opdk-install-component.yml +++ b/installations/aio/components/opdk-install-component.yml
@@ -14,6 +14,7 @@ - ~/.apigee/credentials.yml roles: - apigee-opdk-setup-os-limits +# - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } tags: - os @@ -40,7 +41,7 @@ roles: - apigee-opdk-setup-silent-installation-config - apigee-opdk-setup-component-installer - - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } +# - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } tags: - installer @@ -48,7 +49,6 @@ serial: 1 roles: - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' } +# - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' } tags: - component - -
diff --git a/installations/baas/clean.yml b/installations/baas/clean.yml index 72ff1ad..2419405 100644 --- a/installations/baas/clean.yml +++ b/installations/baas/clean.yml
@@ -1,17 +1,18 @@ --- - hosts: localhost connection: local - tasks: - - name: Remove .ansible_cache + - name: Clean files + async: 0 + poll: 0 + ignore_errors: yes file: path: '{{ item }}' state: absent - force: yes with_items: - '~/.ansible/tmp/cache' - '~/.ansible/tmp/ansible.log' - - 'ssh_keys' - - 'configs_and_logs' - - 'rpm_resources' + - '~/.apigee/ssh_keys' + - '~/.apigee/logs' + - '~/.apigee/configs'
diff --git a/installations/baas/components/opdk-install-component.yml b/installations/baas/components/opdk-install-component.yml index c62fb8d..c2b5cd2 100644 --- a/installations/baas/components/opdk-install-component.yml +++ b/installations/baas/components/opdk-install-component.yml
@@ -14,6 +14,7 @@ - ~/.apigee/credentials.yml roles: - apigee-opdk-setup-os-limits +# - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } tags: - os @@ -40,7 +41,7 @@ roles: - apigee-opdk-setup-silent-installation-config - apigee-opdk-setup-component-installer - - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } +# - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } tags: - installer @@ -48,5 +49,6 @@ serial: 1 roles: - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' } +# - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' } tags: - component
diff --git a/installations/dc1/clean.yml b/installations/dc1/clean.yml index 72ff1ad..2419405 100644 --- a/installations/dc1/clean.yml +++ b/installations/dc1/clean.yml
@@ -1,17 +1,18 @@ --- - hosts: localhost connection: local - tasks: - - name: Remove .ansible_cache + - name: Clean files + async: 0 + poll: 0 + ignore_errors: yes file: path: '{{ item }}' state: absent - force: yes with_items: - '~/.ansible/tmp/cache' - '~/.ansible/tmp/ansible.log' - - 'ssh_keys' - - 'configs_and_logs' - - 'rpm_resources' + - '~/.apigee/ssh_keys' + - '~/.apigee/logs' + - '~/.apigee/configs'
diff --git a/installations/dc1/components/opdk-install-component.yml b/installations/dc1/components/opdk-install-component.yml index c0c1935..c2b5cd2 100644 --- a/installations/dc1/components/opdk-install-component.yml +++ b/installations/dc1/components/opdk-install-component.yml
@@ -14,6 +14,7 @@ - ~/.apigee/credentials.yml roles: - apigee-opdk-setup-os-limits +# - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } tags: - os @@ -40,14 +41,14 @@ roles: - apigee-opdk-setup-silent-installation-config - apigee-opdk-setup-component-installer - - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } +# - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } tags: - installer - hosts: '{{ hosts }}' serial: 1 - roles: - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' } +# - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' } tags: - component
diff --git a/installations/dc2/components/opdk-install-component.yml b/installations/dc2/components/opdk-install-component.yml index c62fb8d..c2b5cd2 100644 --- a/installations/dc2/components/opdk-install-component.yml +++ b/installations/dc2/components/opdk-install-component.yml
@@ -14,6 +14,7 @@ - ~/.apigee/credentials.yml roles: - apigee-opdk-setup-os-limits +# - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } tags: - os @@ -40,7 +41,7 @@ roles: - apigee-opdk-setup-silent-installation-config - apigee-opdk-setup-component-installer - - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } +# - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } tags: - installer @@ -48,5 +49,6 @@ serial: 1 roles: - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' } +# - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' } tags: - component
diff --git a/installations/monetization/clean.yml b/installations/monetization/clean.yml index 72ff1ad..2419405 100644 --- a/installations/monetization/clean.yml +++ b/installations/monetization/clean.yml
@@ -1,17 +1,18 @@ --- - hosts: localhost connection: local - tasks: - - name: Remove .ansible_cache + - name: Clean files + async: 0 + poll: 0 + ignore_errors: yes file: path: '{{ item }}' state: absent - force: yes with_items: - '~/.ansible/tmp/cache' - '~/.ansible/tmp/ansible.log' - - 'ssh_keys' - - 'configs_and_logs' - - 'rpm_resources' + - '~/.apigee/ssh_keys' + - '~/.apigee/logs' + - '~/.apigee/configs'
diff --git a/installations/monetization/components/opdk-install-component.yml b/installations/monetization/components/opdk-install-component.yml index c3f083d..e92d52a 100644 --- a/installations/monetization/components/opdk-install-component.yml +++ b/installations/monetization/components/opdk-install-component.yml
@@ -14,6 +14,7 @@ - ~/.apigee/credentials.yml roles: - apigee-opdk-setup-os-limits +# - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } tags: - os @@ -40,7 +41,7 @@ roles: - apigee-opdk-setup-silent-installation-config - apigee-opdk-setup-component-installer - - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } +# - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' } tags: - installer @@ -50,5 +51,6 @@ - { role: apigee-opdk-set-reachable, reachable: false } - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' } - { role: apigee-opdk-set-reachable, reachable: true } +# - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' } tags: - component