Skip to content

Commit

Permalink
Apr-CR6 (#336)
Browse files Browse the repository at this point in the history
  • Loading branch information
sabrina-yee authored Apr 30, 2024
1 parent a8a95df commit d135841
Show file tree
Hide file tree
Showing 55 changed files with 284 additions and 63 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Connections8:
-r-xr-xr-x 1 root root 66 Aug 22 05:20 HCL_Connections_8.0_lin.tar.sha256
-r-xr-xr-x 1 root root 661821440 Aug 22 05:20 HCL_Connections_8.0_wizards_lin_aix.tar
-r-xr-xr-x 1 root root 66 Aug 22 05:20 HCL_Connections_8.0_wizards_lin_aix.tar.sha256
-r-xr-xr-x 1 root root Jan 26 16:41 HC8.0_CR5.zip
-r-xr-xr-x 1 root root Apr 10 16:41 HC8.0_CR6.zip
DB2:
-rw-r--r--. 1 dmenges dmenges 3993254 Oct 16 13:13 DB2_ESE_AUSI_Activation_11.5.zip
Expand Down
15 changes: 11 additions & 4 deletions documentation/VARIABLES.md
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ sametime_host | *none* | Sametime server hostname
sametime_ltpa_files | *none* | LTPA key file to import to WebSphere
sametime_ltpa_key_password | *none* | Password of the LTPA key file
cnx_ic360_cluster | Apps | Cluster running IC360
sharepoint_client_id | *none* - optional | If defined, will configure Sharepoint widget
sharepoint_tenant_id | *none* - optional | If defined, will configure Sharepoint widget


### Docs Variables
Expand Down Expand Up @@ -305,7 +307,7 @@ uninstall_tinyeditors | true | true will uninstall Tiny Editors
### Component Pack Infra Variables
Name | Default | Description
---- | --------| -------------
containerd_version | 1.6.24-3.1.el7 | Containerd version to be installed
containerd_version | 1.6.26-3.1.el7 | Containerd version to be installed
docker_version | 20.10.12 | Docker version to be installed
docker_insecure_registries | {{ docker_registry_url }} | Docker insecure-registries setting
registry_port | 5000 | The registry defaults to listening on port 5000
Expand All @@ -315,7 +317,7 @@ component_pack_helm_repository | https://hclcr.io/chartrepo/cnx | Helm repo url,
registry_user | admin | Docker Registry user name
registry_password | password | Docker Registry user password
overlay2_enabled | true | true enables OverlayFS storage driver
kubernetes_version | 1.28.4 | Kubernetes version to be installed
kubernetes_version | 1.29.0 | Kubernetes version to be installed
kube_binaries_install_dir | /usr/bin | kuberneters binary install directory
kube_binaries_download_url | https://storage.googleapis.com/kubernetes-release/release | kuberneters binary download path
ic_internal | localhost | Connections server internal frontend host (eg. IHS host)
Expand All @@ -327,7 +329,12 @@ helm_version | 3.11.3 | Helm version to be installed
haproxy_version | 2.6.6 | HAProxy version to be installed
haproxy_url | *none* | Alternative HAProxy tar download location
ssl_root_ca | /C=US/ST=CA/L=Sunnyvale/O=HCL America Inc/OU=Software/CN=hcltechsw.com | SSL Root CA Certificate

build_nginx | true | true will build and install NGINX with headers-more-nginx-module to allow removal of Server information from header
nginx_install_dir | /etc/nginx | NGINX install location
nginx_logs_dir | /var/log/nginx | NGINX logs location
nginx_pid_loc | /run/nginx.pid | Used when build_nginx=true, NGINX pid file location
nginx_exec_path | /usr/sbin/nginx | Used when build_nginx=true, NGINX executable location
nginx_user | nginx | User to run the NGINX process

### Component Pack Variables
Name | Default | Description
Expand Down Expand Up @@ -364,7 +371,6 @@ setup_customizer | true | True will deploy mw-proxy and setup customizations
elasticsearch_default_version | 7 | Default ElasticSearch version
elasticsearch_default_port | 30098 | ElasticSearch port
elasticsearch_replica_count | 3 | Replica count to set in Helm charts for Elasticsearch
elasticsearch_auto_expand_replicas | *none* | Whether the ElasticSearch cluster should automatically add replica shards based on the number of data nodes. Specify a lower bound and upper limit (for example, 0–9) or all for the upper limit. For example, if you have 5 data nodes and set index.auto_expand_replicas to 0–3, then the cluster does not automatically add another replica shard. However, if you set this value to 0-all and add 2 more nodes for a total of 7, the cluster will expand to now have 6 replica shards
setup_elasticsearch | false | True will deploy ElasticSearch 5 (for Connections 6.5CR1)
setup_elasticsearch7 | false | True will deploy ElasticSearch 7 (for Connections 7)
setup_opensearch | True | True will deploy OpenSearch
Expand Down Expand Up @@ -404,6 +410,7 @@ opensearch_watermark_flood_stage | none | Controls the flood stage watermark for
opensearch_watermark_high | *none* | Controls the high watermark for disk usage for opensearch. Make sure that the opensearch_watermark_flood_stage is more than or equal to opensearch_watermark_high
opensearch_watermark_low | *none* | Controls the low watermark for disk usage for opensearch. Make sure that the opensearch_watermark_high is more than or equal to opensearch_watermark_low
opensearch_auto_expand_replicas | *none* | Whether the OpenSearch cluster should automatically add replica shards based on the number of data nodes. Specify a lower bound and upper limit (for example, 0–9) or all for the upper limit. For example, if you have 5 data nodes and set index.auto_expand_replicas to 0–3, then the cluster does not automatically add another replica shard. However, if you set this value to 0-all and add 2 more nodes for a total of 7, the cluster will expand to now have 6 replica shards
elasticsearch_auto_expand_replicas | *none* | Whether the ElasticSearch cluster should automatically add replica shards based on the number of data nodes. Specify a lower bound and upper limit (for example, 0–9) or all for the upper limit. For example, if you have 5 data nodes and set index.auto_expand_replicas to 0–3, then the cluster does not automatically add another replica shard. However, if you set this value to 0-all and add 2 more nodes for a total of 7, the cluster will expand to now have 6 replica shards

### NFS Variables
Name | Default | Description
Expand Down
2 changes: 1 addition & 1 deletion documentation/howtos/connections_upgrade_to_8.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ kubectl delete ingress -n connections $(kubectl get ingress -n connections | awk
>Ensure you reconfigure NFS by running playbook playbooks/third_party/setup-nfs.yml.
</details>
Follow [Kubernetes official document](https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade/) on how to upgrade kubernetes version. Kubernetes can be upgraded to the next minor version using below playbook. Do NOT skip MINOR versions when upgrading Kubernetes. For example, if you are upgrading from 1.26 -> 1.28, it needs to be upgraded from 1.26 -> 1.27 -> 1.28. Add 'upgrade_version' variable in the [inventory file](https://github.com/HCL-TECH-SOFTWARE/connections-automation/blob/main/environments/examples/cnx8/db2/group_vars/all.yml) to the target version and adjust before running the playbook each time:
Follow [Kubernetes official document](https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade/) on how to upgrade kubernetes version. Kubernetes can be upgraded to the next minor version using below playbook. Do NOT skip MINOR versions when upgrading Kubernetes. For example, if you are upgrading from 1.27 -> 1.29, it needs to be upgraded from 1.27 -> 1.28 -> 1.29. Add 'upgrade_version' variable in the [inventory file](https://github.com/HCL-TECH-SOFTWARE/connections-automation/blob/main/environments/examples/cnx8/db2/group_vars/all.yml) to the target version and adjust before running the playbook each time:
```
ansible-playbook -i environments/examples/cnx8/db2/inventory.ini playbooks/third_party/kubernetes/upgrade-kubernetes.yml
Expand Down
4 changes: 2 additions & 2 deletions environments/examples/cnx8/db2/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ cnx_repository_url: "http://{{ groups['installer'][
tinyeditors_download_location: http://{{ groups['installer'][0] }}:8001/TinyEditors
cnx_fixes_repository_url: "http://{{ groups['installer'][0] }}:8001/{{ connections_kit_folder }}"

cnx_fixes_version: "8.0.0.0_CR5"
cnx_fixes_version: "8.0.0.0_CR6"
cnx_fixes_files:
- { file_name: "HC8.0_CR5.zip" }
- { file_name: "HC8.0_CR6.zip" }

cnx_package: "HCL_Connections_8.0_lin.tar"
connections_wizards_package_name: "HCL_Connections_8.0_wizards_lin_aix.tar"
Expand Down
4 changes: 2 additions & 2 deletions environments/examples/cnx8/oracle/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ cnx_repository_url: "http://{{ groups['installer'][
tinyeditors_download_location: http://{{ groups['installer'][0] }}:8001/TinyEditors
cnx_fixes_repository_url: "http://{{ groups['installer'][0] }}:8001/{{ connections_kit_folder }}"

cnx_fixes_version: "8.0.0.0_CR5"
cnx_fixes_version: "8.0.0.0_CR6"
cnx_fixes_files:
- { file_name: "HC8.0_CR5.zip" }
- { file_name: "HC8.0_CR6.zip" }

cnx_package: "HCL_Connections_8.0_lin.tar"
connections_wizards_package_name: "HCL_Connections_8.0_wizards_lin_aix.tar"
Expand Down
4 changes: 2 additions & 2 deletions environments/examples/cnx8/quick_start/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ cnx_repository_url: "http://{{ groups['installer'][
tinyeditors_download_location: http://{{ groups['installer'][0] }}:8001/TinyEditors
cnx_fixes_repository_url: "http://{{ groups['installer'][0] }}:8001/{{ connections_kit_folder }}"

cnx_fixes_version: "8.0.0.0_CR5"
cnx_fixes_version: "8.0.0.0_CR6"
cnx_fixes_files:
- { file_name: "HC8.0_CR5.zip" }
- { file_name: "HC8.0_CR6.zip" }

cnx_package: "HCL_Connections_8.0_lin.tar"
connections_wizards_package_name: "HCL_Connections_8.0_wizards_lin_aix.tar"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ cnx_repository_url: "http://{{ groups['installer'][
tinyeditors_download_location: http://{{ groups['installer'][0] }}:8001/TinyEditors
cnx_fixes_repository_url: "http://{{ groups['installer'][0] }}:8001/{{ connections_kit_folder }}"

cnx_fixes_version: "8.0.0.0_CR5"
cnx_fixes_version: "8.0.0.0_CR6"
cnx_fixes_files:
- { file_name: "HC8.0_CR5.zip" }
- { file_name: "HC8.0_CR6.zip" }

cnx_package: "HCL_Connections_8.0_lin.tar"
connections_wizards_package_name: "HCL_Connections_8.0_wizards_lin_aix.tar"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ cnx_repository_url: "http://{{ groups['installer'][
tinyeditors_download_location: http://{{ groups['installer'][0] }}:8001/TinyEditors
cnx_fixes_repository_url: "http://{{ groups['installer'][0] }}:8001/{{ connections_kit_folder }}"

cnx_fixes_version: "8.0.0.0_CR5"
cnx_fixes_version: "8.0.0.0_CR6"
cnx_fixes_files:
- { file_name: "HC8.0_CR5.zip" }
- { file_name: "HC8.0_CR6.zip" }

cnx_package: "HCL_Connections_8.0_lin.tar"
connections_wizards_package_name: "HCL_Connections_8.0_wizards_lin_aix.tar"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ cnx_repository_url: "http://{{ groups['installer'][
tinyeditors_download_location: http://{{ groups['installer'][0] }}:8001/TinyEditors
cnx_fixes_repository_url: "http://{{ groups['installer'][0] }}:8001/{{ connections_kit_folder }}"

cnx_fixes_version: "8.0.0.0_CR5"
cnx_fixes_version: "8.0.0.0_CR6"
cnx_fixes_files:
- { file_name: "HC8.0_CR5.zip" }
- { file_name: "HC8.0_CR6.zip" }

cnx_package: "HCL_Connections_8.0_lin.tar"
connections_wizards_package_name: "HCL_Connections_8.0_wizards_lin_aix.tar"
Expand Down
2 changes: 1 addition & 1 deletion roles/hcl/component-pack-harbor/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
__kubernetes_version: "{{ kubernetes_version | default('1.28.4') }}"
__kubernetes_version: "{{ kubernetes_version | default('1.29.0') }}"
__python_path: "{{ python_path | default('/usr/bin/python3') }}"
__ansible_cache: "/tmp/k8s_ansible"
__sudo_user: "{{ kubectl_user | default( ansible_env['SUDO_USER'] ) }}"
Expand Down
1 change: 1 addition & 0 deletions roles/hcl/component-pack/tasks/setup_installation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
src: "{{ __download_location }}/{{ __package_name }}"
dest: "{{ __extraction_folder }}"
remote_src: yes
validate_certs: false
register: download_and_unpack_component_pack
until: download_and_unpack_component_pack is succeeded
retries: 3
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
src: "{{ __docs_download_location }}/{{ __docs_package_name }}"
dest: "{{ __docs_extraction_folder }}"
remote_src: yes
validate_certs: false
when:
- not docs_database_already_created.stat.exists

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
src: "{{ __docs_download_location }}/{{ __docs_package_name }}"
dest: "{{ __docs_extraction_folder }}"
remote_src: yes
validate_certs: false
when:
- not docs_migrations_already_done.stat.exists

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
src: "{{ __download_location }}/{{ __package_name }}"
dest: "{{ __db_extraction_folder }}"
remote_src: yes
validate_certs: false
when:
- (not migrations_already_done.stat.exists) or (__cnx_force_repopulation |bool) or (__db_enable_upgrades |bool)
retries: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
src: "{{ __download_location }}/{{ __package_name }}"
dest: "{{ __db_extraction_folder }}"
remote_src: yes
validate_certs: false
when:
- (not migrations_already_done.stat.exists) or (__cnx_force_repopulation |bool) or (__db_enable_upgrades |bool)
retries: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@
url: "{{ cnx_repository_url }}/{{ __cnx_ifix_installer }}"
dest: "{{ __tmp_dir }}/cnx-ifix/{{ __cnx_ifix_installer }}"
mode: 0755
validate_certs: false

- name: Extract the updateInstaller
unarchive:
src: "{{ __tmp_dir }}/cnx-ifix/{{ __cnx_ifix_installer }}"
dest: "{{ __cnx_install_location }}/updateInstaller"
copy: no
validate_certs: false
register: download_and_unpack_connections_upgradeinstaller
until: download_and_unpack_connections_upgradeinstaller is succeeded
retries: 3
Expand All @@ -47,3 +49,4 @@
url: "{{ cnx_repository_url }}/{{ ifix_file }}"
dest: "{{ __cnx_install_location }}/updateInstaller/fixes"
mode: 0755
validate_certs: false
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
regexp: "{{ item.regexp1 }}"
replace: "{{ item.replace }}"
with_items:
- { path: '{{ __widgets_config_file }}', regexp1: 'value="{clientId}"', replace: 'value="{{ __sharepoint_client_id }}"'}
- { path: '{{ __widgets_config_file }}', regexp1: 'value="{tenant}"', replace: 'value="{{ __sharepoint_tenant_id }}"'}
- { path: '{{ __widgets_config_file }}', regexp1: 'value="{clientId}"', replace: 'value="{{ sharepoint_client_id }}"'}
- { path: '{{ __widgets_config_file }}', regexp1: 'value="{tenant}"', replace: 'value="{{ sharepoint_tenant_id }}"'}
when: sharepoint_client_id is defined and sharepoint_tenant_id is defined
4 changes: 0 additions & 4 deletions roles/hcl/connections/post_install_config/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ __selfreg_ldap_guid_xpath: "/config/ldap-connector/external-user-server
__selfreg_profile_base_guid_xpath: "/config/profiles-connector/entry/attributes/attribute[key='com.ibm.snx_profiles.base.guid']/value"
__cnx_enable_invite: "{{ cnx_enable_invite | default('false') }}"

# Sharepoint Widget Configuration
__sharepoint_client_id: "{{ sharepoint_client_id | default('c14ed562-5a27-4723-82b6-62cca82d2fcc') }}"
__sharepoint_tenant_id: "{{ sharepoint_tenant_id | default('b799d683-9a83-4044-a827-c88e16238a7b') }}"

# Files - files-config.xml
__filescfg_full_path: "{{ __was_install_location }}/profiles/{{ __profile_name }}/config/cells/{{ __was_cellname }}/LotusConnections-config/files-config.xml"
__filescfg_namespaces:
Expand Down
1 change: 1 addition & 0 deletions roles/hcl/connections/set_all_auth_role/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
__app: "{{ item }}"
__role_mapping_prop:
- { __role: "READER", __everyone: "no", __allauth: "{{ __allauth_value }}", __users: '""', __groups: '""', __allauth_trusted: "{{ __allauth_trusted_value }}", __mappeduseraccessids: '""', __mappedgroupaccessids: '""' }
- { __role: "CEC-READER", __everyone: "no", __allauth: "{{ __allauth_value }}", __users: '""', __groups: '""', __allauth_trusted: "{{ __allauth_trusted_value }}", __mappeduseraccessids: '""', __mappedgroupaccessids: '""' }
with_items:
- ICEC
when:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
get_url:
url: "{{ cnx_repository_url }}/{{ __cnx_package }}"
dest: "{{ __tmp_dir }}/cnx"
timeout: 300
timeout: 300
validate_certs: false

- name: "Calculate checksum of {{ __tmp_dir }}/cnx/{{ __cnx_package }}"
shell: sha256sum "{{ __tmp_dir }}/cnx"/"{{ __cnx_package }}" | cut -d' ' -f1
Expand Down
2 changes: 2 additions & 0 deletions roles/hcl/connections/tasks/download_extract_connections.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
url: "{{ cnx_repository_url }}/{{ item.file_name }}"
dest: "{{ __tmp_dir }}/cnx/{{ item.file_name }}"
mode: 0755
validate_certs: false
with_items: "{{ __ccm_files }}"
when: (ccm_install is defined)

Expand All @@ -45,6 +46,7 @@
url: "{{ cnx_fixes_repository_url }}/{{ item.file_name }}"
dest: "{{ __tmp_dir }}/cnx-cr/{{ item.file_name }}"
mode: 0755
validate_certs: false
with_items: "{{ __cnx_fixes_files }}"
when: (__cnx_fixes_version != '')

Expand Down
1 change: 1 addition & 0 deletions roles/hcl/docs/tasks/download_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
src: "{{ __download_location }}/{{ __package_name }}"
dest: "{{ __extraction_folder }}"
remote_src: yes
validate_certs: false
register: download_and_unpack_docs
until: download_and_unpack_docs is succeeded
retries: 3
Expand Down
1 change: 1 addition & 0 deletions roles/hcl/docs/unpack_docs_installer/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
src: "{{ app_zip_name.files[0].path }}"
dest: "{{ __extraction_folder }}/{{ __app_name }}"
remote_src: yes
validate_certs: false
register: unpacked_zip
until: unpacked_zip is succeeded

Expand Down
2 changes: 1 addition & 1 deletion roles/third_party/containerd-install/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
__containerd_default_version: "1.6.24-3.1.el{{ ansible_distribution_major_version }}"
__containerd_default_version: "1.6.26-3.1.el{{ ansible_distribution_major_version }}"
__containerd_version: "{{ containerd_version | default( __containerd_default_version ) }}"

__modules_containerd_conf_template: "containerd.conf.j2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- name: Build Haproxy target with params
make:
chdir: "{{ __haproxy_download_dir }}"
target: all
params:
TARGET: linux_glibc
USE_PCRE: 1
Expand Down
Loading

0 comments on commit d135841

Please sign in to comment.