updated variables
diff --git a/defaults/main.yml b/defaults/main.yml index 734c326..e1764c2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml
@@ -46,15 +46,6 @@ # defaults file for apigee-opdk-setup-default-settings credentials_file: '{{ local_apigee_secure }}/credentials.yml' -# Apigee silent installation configuration file -#opdk_installation_config_file: "{{ opdk_installer_path }}/edge-response.conf" - -## Silent config file for portal -#opdk_portal_config_file: '{{ opdk_installer_path }}/edge-devportal-response-{{ opdk_version }}-{{ region }}.conf' - -# Silent config file for portal -opdk_portal_db_config_file: '{{ opdk_installer_path }}/devportal-postgres.conf' - # defaults file for apigee-opdk-setup-ps apigee_postgresql_data_dir: '{{ apigee_home }}/data/apigee-postgresql/pgdata'
diff --git a/tasks/region.yml b/tasks/region.yml index 30df261..9d91344 100644 --- a/tasks/region.yml +++ b/tasks/region.yml
@@ -14,6 +14,11 @@ region: 'dc-3' when: groups['dc-3'] is defined and inventory_hostname in groups['dc-3'] +- name: Set default region if not set + set_fact: + region: 'dc-1' + when: region is not defined or region | trim | length == 0 + - name: Add region to cache cache: key: "region"
diff --git a/tasks/update_cache.yml b/tasks/update_cache.yml index ef928ce..30a121a 100644 --- a/tasks/update_cache.yml +++ b/tasks/update_cache.yml
@@ -73,3 +73,6 @@ - { key: 'opdk_smtp_mail_from', value: '{{ opdk_smtp_mail_from }}' } - { key: 'enable_system_check', value: '{{ enable_system_check }}' } - { key: 'opdk_portal_db_config_file', value: "{{ opdk_portal_db_config_file }}" } + - { key: 'opdk_installation_config_file', value: '{{ opdk_installer_path }}/edge-response-{{ opdk_version }}-{{ region }}.conf' } + - { key: 'opdk_portal_config_file', value: '{{ opdk_installer_path }}/edge-devportal-response-{{ opdk_version }}.conf' } + - { key: 'opdk_portal_db_config_file', value: '{{ opdk_installer_path }}/devportal-postgres.conf' } \ No newline at end of file