worked to resolve collision between these roles.
diff --git a/defaults/main.yml b/defaults/main.yml index 4f803ad..96c56df 100644 --- a/defaults/main.yml +++ b/defaults/main.yml
@@ -1,36 +1,36 @@ --- # defaults file for apigee-opdk-setup-bootstrap - -# Path to the Apigee archive -apigeerepobasepath: '{{ apigee_home }}/data/apigee-mirror' - -# Apigee service command for 4.16.xx -apigee_service: '{{ apigee_home }}/apigee-service/bin/apigee-service' - -# Apigee setup command for 4.16.xx -apigee_setup: '{{ apigee_home }}/apigee-setup/bin/setup.sh' - -# Apigee update command for 4.16.xx -apigee_update: '{{ apigee_home }}/apigee-setup/bin/update.sh' - -# Apigee all command for 4.16.xx -apigee_all: '{{ apigee_home }}/apigee-service/bin/apigee-all' - -# Apigee license file path -opdk_license_target_file_path: "{{ opdk_installer_path }}/license.conf" - -# Apigee license file provided by customer -opdk_license_source_file_name: '{{ local_apigee_secure }}/license.txt' - -# Apigee bootstrap download user name -default_apigee_repo_user: '{{ opdk_user_name }}' - -# Apigee bootstra download user name password -default_apigee_repo_password: '' - -# Apigee bootstrap download uri -default_apigee_repo_uri: 'software.apigee.com' - -# Apigee bootstrap download url -default_apigee_repo_protocol: 'https' -default_apigee_repo_url: '{{ default_apigee_repo_protocol }}://{{ default_apigee_repo_uri }}' +# +## Path to the Apigee archive +#apigeerepobasepath: '{{ apigee_home }}/data/apigee-mirror' +# +## Apigee service command for 4.16.xx +#apigee_service: '{{ apigee_home }}/apigee-service/bin/apigee-service' +# +## Apigee setup command for 4.16.xx +#apigee_setup: '{{ apigee_home }}/apigee-setup/bin/setup.sh' +# +## Apigee update command for 4.16.xx +#apigee_update: '{{ apigee_home }}/apigee-setup/bin/update.sh' +# +## Apigee all command for 4.16.xx +#apigee_all: '{{ apigee_home }}/apigee-service/bin/apigee-all' +# +## Apigee license file path +#opdk_license_target_file_path: "{{ opdk_installer_path }}/license.conf" +# +## Apigee license file provided by customer +#opdk_license_source_file_name: '{{ local_apigee_secure }}/license.txt' +# +## Apigee bootstrap download user name +#default_apigee_repo_user: '{{ opdk_user_name }}' +# +## Apigee bootstra download user name password +#default_apigee_repo_password: '' +# +## Apigee bootstrap download uri +#default_apigee_repo_uri: 'software.apigee.com' +# +## Apigee bootstrap download url +#default_apigee_repo_protocol: 'https' +#default_apigee_repo_url: '{{ default_apigee_repo_protocol }}://{{ default_apigee_repo_uri }}'
diff --git a/tasks/cache.yml b/tasks/cache.yml index b13eb66..6fbe470 100644 --- a/tasks/cache.yml +++ b/tasks/cache.yml
@@ -6,15 +6,15 @@ key: "{{ item.key }}" value: "{{ item.value }}" with_items: - - { key: "apigeerepobasepath", value: "{{ apigeerepobasepath }}" } - - { key: 'apigee_service', value: '{{ apigee_service }}' } - - { key: 'apigee_setup', value: '{{ apigee_setup }}' } - - { 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: 'opdk_license_source_file_name', value: "{{ opdk_license_source_file_name }}" } - - { key: 'default_apigee_repo_user', value: '{{ default_apigee_repo_user }}' } - - { key: 'default_apigee_repo_password', value: '{{ default_apigee_repo_password}}' } - - { key: 'default_apigee_repo_uri', value: '{{ default_apigee_repo_uri }}' } - - { key: 'default_apigee_repo_protocol', value: '{{ default_apigee_repo_protocol }}' } - - { key: 'default_apigee_repo_url', value: '{{ default_apigee_repo_url }}' } + - { key: "apigeerepobasepath", value: "{{ apigee_home }}/data/apigee-mirror" } + - { key: 'apigee_service', value: '{{ apigee_home }}/apigee-service/bin/apigee-service' } + - { key: 'apigee_setup', value: '{{ apigee_home }}/apigee-setup/bin/setup.sh' } + - { key: 'apigee_update', value: '{{ apigee_home }}/apigee-setup/bin/update.sh' } + - { key: 'apigee_all', value: '{{ apigee_home }}/apigee-service/bin/apigee-all' } + - { key: 'opdk_license_target_file_path', value: "{{ opdk_installer_path }}/license.conf" } + - { key: 'opdk_license_source_file_name', value: "{{ local_apigee_secure }}/license.txt" } + - { key: 'default_apigee_repo_user', value: '{{ opdk_user_name }}' } + - { key: 'default_apigee_repo_password', value: '' } + - { key: 'default_apigee_repo_uri', value: 'software.apigee.com' } + - { key: 'default_apigee_repo_protocol', value: 'https' } + - { key: 'default_apigee_repo_url', value: '{{ default_apigee_repo_protocol }}://{{ default_apigee_repo_uri }}' }