diff --git a/Ansible/ansible_collections/jfrog/installers/galaxy.yml b/Ansible/ansible_collections/jfrog/installers/galaxy.yml index 64bf9c9..605050a 100644 --- a/Ansible/ansible_collections/jfrog/installers/galaxy.yml +++ b/Ansible/ansible_collections/jfrog/installers/galaxy.yml @@ -9,7 +9,7 @@ namespace: "jfrog" name: "installers" # The version of the collection. Must be compatible with semantic versioning -version: "1.1.0" +version: "1.1.1" # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: "README.md" diff --git a/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.1.0.tar.gz b/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.1.0.tar.gz deleted file mode 100644 index 5e8aebb..0000000 Binary files a/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.1.0.tar.gz and /dev/null differ diff --git a/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.1.1.tar.gz b/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.1.1.tar.gz new file mode 100644 index 0000000..448b6f5 Binary files /dev/null and b/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.1.1.tar.gz differ diff --git a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/defaults/main.yml b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/defaults/main.yml index 5cdaab6..eaeddfa 100644 --- a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/defaults/main.yml @@ -49,4 +49,8 @@ service_list: group_name: "{{ artifactory_group }}" # if this is an upgrade -artifactory_upgrade_only: false \ No newline at end of file +artifactory_upgrade_only: false + +#default username and password +artifactory_app_username: admin +artifactory_app_user_pass: password \ No newline at end of file diff --git a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/install.yml b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/install.yml index a0e98ff..9537459 100644 --- a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/install.yml +++ b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/install.yml @@ -52,8 +52,30 @@ until: downloadartifactory is succeeded retries: 3 -- name: MV untar directory to artifactory home - command: "mv {{ artifactory_untar_home }} {{ artifactory_home }}" +- name: Create artifactory home folder + file: + state: directory + path: "{{ artifactory_home }}" + owner: "{{ artifactory_user }}" + group: "{{ artifactory_group }}" + become: yes + +- name: Create Symlinks for var folder + file: + state: link + src: "{{ artifactory_untar_home }}/var" + dest: "{{ artifactory_home }}/var" + owner: "{{ artifactory_user }}" + group: "{{ artifactory_group }}" + become: yes + +- name: Create Symlinks for app folder + file: + state: link + src: "{{ artifactory_untar_home }}/app" + dest: "{{ artifactory_home }}/app" + owner: "{{ artifactory_user }}" + group: "{{ artifactory_group }}" become: yes - name: ensure artifactory_file_store_dir exists @@ -180,7 +202,7 @@ - name: Ensure permissions are correct file: - path: "{{ artifactory_home }}" + path: "{{ jfrog_home_directory }}" group: "{{ artifactory_group }}" owner: "{{ artifactory_user }}" recurse: yes diff --git a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/legacy_migration.yml b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/legacy_migration.yml new file mode 100644 index 0000000..e3e15d5 --- /dev/null +++ b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/legacy_migration.yml @@ -0,0 +1,34 @@ +--- +- name: MV artifactory home to artifactory untar home + command: "mv {{ artifactory_home }} {{ temp_untar_home }}" + become: yes +- name: Ensure untar home permissions are correct + file: + state: directory + path: "{{ temp_untar_home }}" + owner: "{{ artifactory_user }}" + group: "{{ artifactory_group }}" + become: yes +- name: Create artifactory home folder + file: + state: directory + path: "{{ artifactory_home }}" + owner: "{{ artifactory_user }}" + group: "{{ artifactory_group }}" + become: yes +- name: Create Symlinks for var folder + file: + state: link + src: "{{ temp_untar_home }}/var" + dest: "{{ artifactory_home }}/var" + owner: "{{ artifactory_user }}" + group: "{{ artifactory_group }}" + become: yes +- name: Create Symlinks for app folder + file: + state: link + src: "{{ temp_untar_home }}/app" + dest: "{{ artifactory_home }}/app" + owner: "{{ artifactory_user }}" + group: "{{ artifactory_group }}" + become: yes diff --git a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/main.yml b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/main.yml index 3afccb3..02a3819 100644 --- a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/main.yml +++ b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/main.yml @@ -1,6 +1,35 @@ -- name: perform installation - include_tasks: "install.yml" - when: not artifactory_upgrade_only -- name: perform upgrade - include_tasks: "upgrade.yml" - when: artifactory_upgrade_only \ No newline at end of file +- name: Rectify Legacy Installation Block + block: + - name: Check symlink method + stat: + path: /opt/jfrog/artifactory/app + register: newMethod + - name: Check artifactory version + uri: + url: "{{ web_method }}://{{ artifactory_server_url }}:{{ url_port }}/artifactory/api/system/version" + url_username: "{{ artifactory_app_username }}" + url_password: "{{ artifactory_app_user_pass }}" + register: artifactory_installed_version + - name: Debug defunct installation + debug: + var: artifactory_installed_version.json.version + - name: Setup temporary untar home + set_fact: + temp_untar_home: "{{ jfrog_home_directory }}/artifactory-{{ artifactory_flavour }}-{{ artifactory_installed_version }}" + - name: Rectify legacy installation + include_tasks: "legacy_migration.yml" + when: (not newMethod.stat.islnk) and newMethod.stat.exists + rescue: + - name: Setup temporary untar home (assuming version is set var for version) + set_fact: + temp_untar_home: "{{ jfrog_home_directory }}/artifactory-{{ artifactory_flavour }}-{{ artifactory_version }}" + - name: Rectify legacy installation + include_tasks: "legacy_migration.yml" + when: (not newMethod.stat.islnk) and newMethod.stat.exists + always: + - name: perform installation + include_tasks: "install.yml" + when: not artifactory_upgrade_only + - name: perform upgrade + include_tasks: "upgrade.yml" + when: artifactory_upgrade_only \ No newline at end of file diff --git a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/upgrade.yml b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/upgrade.yml index a0273dd..5ac0fd8 100644 --- a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/upgrade.yml +++ b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/upgrade.yml @@ -14,6 +14,19 @@ state: directory become: yes +- name: Local Copy artifactory + unarchive: + src: "{{ local_artifactory_tar }}" + dest: "{{ jfrog_home_directory }}" + owner: "{{ artifactory_user }}" + group: "{{ artifactory_group }}" + creates: "{{ artifactory_untar_home }}" + become: yes + when: local_artifactory_tar is defined + register: downloadartifactory + until: downloadartifactory is succeeded + retries: 3 + - name: download artifactory unarchive: src: "{{ artifactory_tar }}" @@ -23,24 +36,42 @@ group: "{{ artifactory_group }}" creates: "{{ artifactory_untar_home }}" become: yes + when: artifactory_tar is defined register: downloadartifactory until: downloadartifactory is succeeded retries: 3 -- name: Delete artifactory app +#- name: Delete artifactory app +# file: +# path: "{{ artifactory_home }}/app" +# state: absent +# become: yes + +#- name: CP new app to artifactory app +# command: "cp -r {{ artifactory_untar_home }}/app {{ artifactory_home }}/app" +# become: yes + +#- name: Delete untar directory +# file: +# path: "{{ artifactory_untar_home }}" +# state: absent +# become: yes + +- name: Create Symlinks for app folder file: - path: "{{ artifactory_home }}/app" - state: absent + state: link + src: "{{ artifactory_untar_home }}/app" + dest: "{{ artifactory_home }}/app" + owner: "{{ artifactory_user }}" + group: "{{ artifactory_group }}" become: yes -- name: CP new app to artifactory app - command: "cp -r {{ artifactory_untar_home }}/app {{ artifactory_home }}/app" - become: yes - -- name: Delete untar directory +- name: Ensure permissions are correct file: - path: "{{ artifactory_untar_home }}" - state: absent + path: "{{ jfrog_home_directory }}" + group: "{{ artifactory_group }}" + owner: "{{ artifactory_user }}" + recurse: yes become: yes - name: start and enable the primary node diff --git a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/templates/system.yaml.j2 b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/templates/system.yaml.j2 index 419a0c3..a7fede0 100644 --- a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/templates/system.yaml.j2 +++ b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/templates/system.yaml.j2 @@ -32,7 +32,13 @@ shared: ## Example for mysql/postgresql type: "{{ db_type }}" - driver: "{{ db_driver }}" - url: "{{ db_url }}" - username: "{{ db_user }}" +{%+ if db_type == 'derby' -%} +# driver: "{{ db_driver }}" +# url: "{{ db_url }}" +# username: "{{ db_user }}" +{%+ else -%} + driver: "{{ db_driver }}" + url: "{{ db_url }}" + username: "{{ db_user }}" +{%+ endif -%} password: "{{ db_password }}" \ No newline at end of file diff --git a/Openshift4/helm/openshift-xray/LICENSE b/Openshift4/helm/openshift-xray/LICENSE old mode 100755 new mode 100644 diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md old mode 100755 new mode 100644