chore: merge develop to main in prep for next release (#124)

* Update supported Ansible versions * fix: jinja2 templating delimiters failure (VIYAARK-301) (#112) * fix: jinja2 template delimiter usage in ssl_check (VIYAARK-301) (#113) * fix: jinja2 templating delimiter unsafe usage (#114) * fix: jinja2 templating delimiter unsafe usage * fix: additional jinja2 templating delimiters (VIYAARK-301) * feat: remove pre-install playbook ssl_check tasks (VIYAARK-302) (#115) * fix: viyaldapvalidtor jinja2 templating delimiters usage (VIYAARK-303) (#116) * fix: viyaldapvalidtor jinja2 templating delimiters usage (VIYAARK-303) * fix: remove quotes for proper eval (VIYAARK-303) * chore: update CHANGELOG. missing some release notes. * chore: stick with minor version increment. * chore: drop rel start/stop comments from changelog. * fix: change merge playbook python shebang and update README (#118) * fix: SyntaxWarning when running viya-deployment-report (VIYAARK-308) (#119) * fix: SyntaxWarning when running viya-deployment-report (VIYAARK-308) * fix: review comment (VIYAARK-308) * fix: rm inadvertent push of test file (VIYAARK-308) * fix: update link to python requirements (VIYAARK-305) (#121) * Update CHANGELOG in preparation for release (#122) * chore: update CHANGELOG in prep for release * chore: add developer cert of origin for past commits DCO Remediation Commit for Kevin Lingle <[email protected]> I, Kevin Lingle <[email protected]>, hereby add my Signed-off-by to this commit: ed359a8 Signed-off-by: Kevin Lingle <[email protected]> DCO Remediation Commit for Kevin Lingle <[email protected]> I, Kevin Lingle <[email protected]>, hereby add my Signed-off-by to this commit: fbdc979 Signed-off-by: Kevin Lingle <[email protected]> --------- Signed-off-by: Kevin Lingle <[email protected]> * chore: another dco sign-off required DCO Remediation Commit for Kevin Lingle <[email protected]> I, Kevin Lingle <[email protected]>, hereby add my Signed-off-by to this commit: ed359a8 Signed-off-by: Kevin Lingle <[email protected]> * fix: change merge playbook python shebang and update README (#118) * fix: SyntaxWarning when running viya-deployment-report (VIYAARK-308) (#119) * fix: SyntaxWarning when running viya-deployment-report (VIYAARK-308) * fix: review comment (VIYAARK-308) * fix: rm inadvertent push of test file (VIYAARK-308) * fix: update link to python requirements (VIYAARK-305) (#121) * Update CHANGELOG in preparation for release (#122) * chore: update CHANGELOG in prep for release * chore: add developer cert of origin for past commits DCO Remediation Commit for Kevin Lingle <[email protected]> I, Kevin Lingle <[email protected]>, hereby add my Signed-off-by to this commit: ed359a8 Signed-off-by: Kevin Lingle <[email protected]> DCO Remediation Commit for Kevin Lingle <[email protected]> I, Kevin Lingle <[email protected]>, hereby add my Signed-off-by to this commit: fbdc979 Signed-off-by: Kevin Lingle <[email protected]> --------- Signed-off-by: Kevin Lingle <[email protected]> * chore: another dco sign-off required DCO Remediation Commit for Kevin Lingle <[email protected]> I, Kevin Lingle <[email protected]>, hereby add my Signed-off-by to this commit: ed359a8 Signed-off-by: Kevin Lingle <[email protected]> --------- Signed-off-by: Kevin Lingle <[email protected]> Signed-off-by: Kevin Lingle <[email protected]>
sassoftware · Oct 28, 2024 · 9f759a8 · 9f759a8
1 parent 7f2a58f
commit 9f759a8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog for SAS Viya ARK
 
+## Viya35-ark-1.20 - October 23, 2024
+- **Summary**
+  * Clarification of requirements for running merge-playbook. (#118)
+  * merge-playbook Python module update for interoperability with ansible_python_interpreter. (#118)
+  * Minor fix for SyntaxWarning when running deployment-report. (#119)
+  * Update message output for pre-install-playbook minimum Python version check. (#121)
+- Ansible Support: Ansible 2.14 - 2.16
+
+
 ## Viya35-ark-1.19 - March 25, 2024
 - **Summary**
   * Changes related to Viya 3.5 support for a new range of Ansible versions.

diff --git a/playbooks/deployment-report/library/get_sas_host_details.py b/playbooks/deployment-report/library/get_sas_host_details.py
@@ -1426,7 +1426,7 @@ def _get_process_memory_info(pid, module):
 
     for row in processes:
         # skip blank lines
-        if row is '' or not row:
+        if not row:
             continue
 
         nfields = len(row.split()) - 1

diff --git a/playbooks/merge-playbook/README.md b/playbooks/merge-playbook/README.md
@@ -1,7 +1,7 @@
 # SAS Viya Administration Resource Kit (SAS Viya ARK) - Merge SAS Viya Deployment Files Playbook
 This playbook compares and merges user-edited values from configuration files that were used in a previous SAS Viya deployment with new configuration files used for the SAS Viya upgrade process. The configuration files the playbook handles are ```ansible.cfg```, ```vars.yml```, and ```inventory.ini```.
 
-When you run the playbook, it will prompt you for the location of the current inventory file (which is assumed to be in the same directory as the current ansible.cfg and vars.yml files). You can also provide the location from the command line.
+When you run the playbook, it will prompt you for the location of the current (source) inventory file (which is assumed to be in the same directory as the current ansible.cfg and vars.yml files). You can also provide the location from the command line.
 
 The playbook will create time-stamped backups of your files and write them in place. The merged information is included so that they are ready to use. Your inventory file and vars.yml might include a new host group, ```? choose-target-host```, if you do not pass the merge-playbook argument -e "merge_default_host=<your deployTarget>. In this case, you must manually replace that value in inventory.ini and vars.yml with a valid host name to avoid Ansible warnings and failures. 
 
@@ -11,9 +11,9 @@ The playbook will copy the default inventory.ini and vars.yml from the playbook
 
 ## Requirements for running the Playbook
 * Install "ruamel.yaml and six" in your Python installation by running `pip install ruamel.yaml six`
-* The Merge SAS Viya Deployment Files playbooks must be placed under a new generated sas_viya_playbook directory where SAS Viya will be deployed, separate from the sas_viya_playbook directory that was previously deployed from.
+* The Merge SAS Viya Deployment Files playbooks must be placed under a new generated sas_viya_playbook directory from which the target SAS Viya will be deployed. That directory is separate from the current, source sas_viya_playbook directory.
   The directory structure of this project must be preserved. For example: ```sas_viya_playbook/viya-ark/playbooks/merge-playboook/```
-* The following SAS Viya configuration files that were used in the previous deployment must exist in the ```sas_viya_playbook``` directory:
+* The following SAS Viya configuration files that were used to create the current deployment must exist in the source ```sas_viya_playbook``` directory:
   * ```inventory.ini```
   * ```ansible.cfg```
   * ```vars.yml```

diff --git a/playbooks/merge-playbook/library/merge_viya_deployment_files.py b/playbooks/merge-playbook/library/merge_viya_deployment_files.py
@@ -1,7 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 
 #
-# Copyright (c) 2019-2023, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2019-2024, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 

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-2023, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2019-2024, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 ---
@@ -35,7 +35,8 @@
         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."
+         See Python Requirements section of 
+         https://go.documentation.sas.com/doc/en/calcdc/3.5/dplyml0phy0lax/p1gclfomj2px4ln1094gh8tj52mj.htm."
     tags:
       - python_version_check