fixed semantics for archives
diff --git a/defaults/main.yml b/defaults/main.yml index 2ce27c8..46731d8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml
@@ -81,7 +81,7 @@ opdk_license_target_file_path: "{{ opdk_installer_path }}/license.conf" # Local resource location -local_resource_path: ~/.apigee +local_apigee_path: ~/.apigee # Apigee license file provided by customer opdk_license_source_file_name: '~/.apigee-secure/license.txt' @@ -118,13 +118,13 @@ copy_archive: yes # Storage folder for the Apigee archive. Only set when you use an archive. -#archive_folder: /tmp +#apigeerepobasepath: /tmp # Apigee archive that is created when a mirror is used. archive_name: apigee-{{ opdk_version }}.tar.gz # Path to the Apigee archive that is created by apigee-mirror package -archive_path: '{{ apigee_installation_home }}/data/apigee-mirror/{{ archive_name }}' +apigeerepobasepath: '{{ apigee_installation_home }}/data/apigee-mirror' # Apigee edge default pod for silent-config file mp_pod: gateway
diff --git a/tasks/update_cache.yml b/tasks/update_cache.yml index 5537e3e..84947d5 100644 --- a/tasks/update_cache.yml +++ b/tasks/update_cache.yml
@@ -1,9 +1,9 @@ --- -- name: Update cache with archive_folder if provided +- name: Update cache with apigeerepobasepath if provided cache: - key: 'archive_folder' - value: '{{ archive_folder }}' - when: archive_folder is defined + key: 'apigeerepobasepath' + value: '{{ apigeerepobasepath }}' + when: apigeerepobasepath is defined - name: Update cache with provided_response_file if provided cache: @@ -40,7 +40,7 @@ - { key: 'apigee_update', value: '{{ apigee_update }}' } - { key: 'apigee_all', value: '{{ apigee_all }}' } - { key: 'opdk_license_target_file_path', value: "{{ opdk_license_target_file_path }}" } - - { key: 'local_resource_path', value: "{{ local_resource_path }}" } + - { key: 'local_apigee_path', value: "{{ local_apigee_path }}" } - { key: 'opdk_license_source_file_name', value: "{{ opdk_license_source_file_name }}" } - { key: 'opdk_installation_config_file', value: "{{ opdk_installation_config_file }}" } - { key: 'apigee_postgresql_data_dir', value: "{{ apigee_postgresql_data_dir }}" } @@ -52,7 +52,7 @@ - { key: 'default_apigee_repo_url', value: '{{ default_apigee_repo_url }}' } - { key: 'copy_archive', value: '{{ copy_archive }}' } - { key: 'archive_name', value: '{{ archive_name }}' } - - { key: 'archive_path', value: '{{ archive_path }}' } + - { key: 'archive_path', value: '{{ apigeerepobasepath }}' } - { key: 'mp_pod', value: '{{ mp_pod }}' } - { key: 'opdk_ldap_type', value: '{{ opdk_ldap_type }}'} - { key: 'opdk_ldap_remote_host', value: '{{ opdk_ldap_remote_host }}' }