Merge pull request #96 from sassoftware/master

merge from old master to main
sassoftware · May 24, 2023 · 8eab36e · 8eab36e
2 parents 4ccaefe + a054fc2
commit 8eab36e
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog for SAS Viya ARK
 
 <!-- LATEST RELEASE START -->
+## Viya35-ark-1.16 - May 24, 2023
+- **Sumary**:
+  Changes related to Viya 3.5 support for new range of Ansible versions and new minimum Python version.
+- Ansible Support: Ansible 2.12 - Ansible 2.14    
+<!-- LATEST RELEASE END -->
+
 ## Viya35-ark-1.15 - August 23, 2022
 - **Sumary**:
   Changes related to Viya 3.5 support for new range of Ansible versions and new minimum Python version.  Addressed GitHub issue.
@@ -15,7 +21,6 @@
   - SAS Viya Upgrade Tasks Playbooks
     - VIYAARK-265 - Merge playbook: Support Ansible 2.12
 - Ansible Support: Ansible 2.10 - Ansible 2.12    
-<!-- LATEST RELEASE END -->
 
 ## Viya35-ark-1.14 - June 4, 2021
 - **Sumary**:

diff --git a/playbooks/pre-install-playbook/roles/viya-ark.preinstall/defaults/main.yml b/playbooks/pre-install-playbook/roles/viya-ark.preinstall/defaults/main.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2022, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2019-2023, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 ---
@@ -195,10 +195,10 @@ sas_yum_urls:
 
 
 ## third-party software requirements
-required_ansible_min_version: "2.10"
-required_ansible_max_version: "2.12"
-ansible_version_compare_max_version: "2.13"  # Must be set one minor version above required_ansible_max_version
-required_python_min_version: "3.5"
+required_ansible_min_version: "2.12"
+required_ansible_max_version: "2.14"
+ansible_version_compare_max_version: "2.15"  # Must be set one minor version above required_ansible_max_version
+required_python_min_version: "3.10"
 
 
 

diff --git a/playbooks/pre-install-playbook/roles/viya-ark.preinstall/tasks/pre.package_version_check.yml b/playbooks/pre-install-playbook/roles/viya-ark.preinstall/tasks/pre.package_version_check.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2020, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2019-2023, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 ---
@@ -21,17 +21,13 @@
     shell: yum list installed {{ item.name }}
     check_mode: no
     changed_when: False
-    args:
-      warn: no
     register: installed_package
     ignore_errors: true
 
   - name: Check that installed RHEL package '{{ item.name }}' meets minimum version {{ item.value }}
     shell: yum list installed {{ item.name }} | tail -1 | awk '{print $2}'
     check_mode: no
     changed_when: False
-    args:
-      warn: no
     register: installed_package_version
     when: installed_package.rc == 0
 
@@ -45,8 +41,6 @@
     shell: yum list available {{ item.name }}
     check_mode: no
     changed_when: False
-    args:
-      warn: no
     register: package_available
     ignore_errors: true
     when: not package_meets_requirement
@@ -64,8 +58,6 @@
     shell: yum list available {{ item.name }} | tail -1 | awk '{print $2}'
     check_mode: no
     changed_when: False
-    args:
-      warn: no
     register: this_version
     when: not package_meets_requirement
 

diff --git a/...oks/pre-install-playbook/roles/viya-ark.preinstall/tasks/pre.required_packages_config.yml b/...oks/pre-install-playbook/roles/viya-ark.preinstall/tasks/pre.required_packages_config.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2021, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2019-2023, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 ---
@@ -210,8 +210,6 @@
 
     - name: obtain systemd minor version
       shell: rpm systemd -q | sed 's/^[^-]*-\([0-9]*-[0-9]*\).*/\1/' | awk -F'[-]' '{print $2}'
-      args:
-        warn: false
       register: systemd_minor
       changed_when: False
       check_mode: no

diff --git a/playbooks/pre-install-playbook/roles/viya-ark.preinstall/tasks/pre.sudo_access_check.yml b/playbooks/pre-install-playbook/roles/viya-ark.preinstall/tasks/pre.sudo_access_check.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2019-2023, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 ---
@@ -62,8 +62,9 @@
        - usersudoaccess
 
   - name: capture the current user's actual sudo rights
-    shell: sudo -l
-    become: no
+    shell: sudo -l -U "{{ ansible_env.SUDO_USER }}"
+    become: yes
+    become_user: root
     ignore_errors: true
     check_mode: no
     changed_when: false

diff --git a/playbooks/pre-install-playbook/roles/viya-ark.preinstall/tasks/pre.third_party_check.yml b/playbooks/pre-install-playbook/roles/viya-ark.preinstall/tasks/pre.third_party_check.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2022, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2019-2023, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 ---
@@ -31,7 +31,11 @@
       that:
         - ansible_python_version is version(required_python_min_version, '>=')
       msg: 
-        "It looks like you are using Python {{ansible_python_version}} but SAS deployment requires Python {{required_python_min_version}}."
+        "It looks like you are using Python {{ansible_python_version}} but SAS deployment requires Python {{required_python_min_version}}.  
+        The asserted minimum version of Python can be altered by changing 'required_python_min_version' 
+        in roles/viya-ark.preinstall/defaults/main.yml or bypass with 
+        '--skip-tags python_version_check'. 
+         See Python section of https://support.sas.com/en/documentation/third-party-software-reference/viya/35/support-for-operating-systems.html#ansible."
     tags:
       - python_version_check
 

diff --git a/playbooks/viya-upgrade/archive_obsolete_log_folders.yml b/playbooks/viya-upgrade/archive_obsolete_log_folders.yml
@@ -6,7 +6,7 @@
 ####                                                                                             ####
 #####################################################################################################
 #
-# Copyright (c) 2020, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2020-2023, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 #####################################################################################################
@@ -139,8 +139,6 @@
     # On SUSE, if the package for the corresponding log folder is still installed then we will skip archiving the log folder.
   - name: "Checking for package existence on SUSE before attempting to archive folders"
     shell: "zypper search --match-exact sas-{{item}}"
-    args:
-      warn: false
     become: yes
     become_user: root
     loop: "{{folders_to_archive}}"
@@ -152,8 +150,6 @@
     # On RHEL, if the package for the corresponding log folder is still installed, then we will skip archiving the log folder.
   - name: "Checking for package existence on Red Hat before attempting to archive folders"
     shell: "yum info sas-{{item}}"
-    args:
-      warn: false
     become: yes
     become_user: root
     loop: "{{folders_to_archive}}"

diff --git a/playbooks/viya-upgrade/post_upgrade/apply_postgres_cve_2017_7547_patch.yml b/playbooks/viya-upgrade/post_upgrade/apply_postgres_cve_2017_7547_patch.yml
@@ -4,7 +4,7 @@
 #### Author: SAS Institute Inc.                                 ####
 ####################################################################
 #
-# Copyright (c) 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2019-2023, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 ####################################################################
@@ -78,7 +78,7 @@
     - name: Retrieve Consul token
       become: yes
       become_user: root
-      shell: "sudo cat {{ SASROOT }}/{{ tenant_id | default('viya') }}/config/etc/SASSecurityCertificateFramework/tokens/consul/default/client.token"
+      shell: "cat {{ SASROOT }}/{{ tenant_id | default('viya') }}/config/etc/SASSecurityCertificateFramework/tokens/consul/default/client.token"
       register: consul_token
       when: security_patch_needed
 

diff --git a/playbooks/viya-upgrade/viya-post-upgrade.yml b/playbooks/viya-upgrade/viya-post-upgrade.yml
@@ -8,7 +8,7 @@
 ####                                                            ####
 ####################################################################
 #
-# Copyright (c) 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2019-2023, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 ####################################################################
@@ -68,6 +68,8 @@
 
 # Create Post-Upgrade Summary
 # This should always be called last
-- import_playbook: common/create_upgrade_summary.yml upgrade_stage=post
+- import_playbook: common/create_upgrade_summary.yml
   tags:
     - always
+  vars:
+    upgrade_stage: post
diff --git a/playbooks/viya-upgrade/viya-pre-upgrade.yml b/playbooks/viya-upgrade/viya-pre-upgrade.yml
@@ -8,7 +8,7 @@
 ####                                                            ####
 ####################################################################
 #
-# Copyright (c) 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2019-2023, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 ####################################################################
@@ -95,6 +95,8 @@
 
 # Create Pre-Upgrade Summary
 # This should always be called last
-- import_playbook: common/create_upgrade_summary.yml upgrade_stage=pre
+- import_playbook: common/create_upgrade_summary.yml
   tags:
     - always
+  vars:
+    upgrade_stage: pre