Merge branch 'nutmeg' into 'master'

Merge nutmeg release branch into main

See merge request sassoftware/viya-ark!370

Author: kevinlinglesas

CHANGELOG.md

@@ -1,6 +1,22 @@
 # Changelog for SAS Viya ARK
 
 <!-- LATEST RELEASE START -->
+## 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.
+- Issues addressed:
+  - SAS Viya Pre-Installation Playbook
+    - VIYAARK-244 - Support Ansible 2.11 (4.0) in Viya ARK Pre-Install Playbook
+    - VIYAARK-263 - Pre-Install: Update the playbook to support Ansible 2.12
+    - VIYAARK-264 - Update Ansible and Python support range
+    - VIYAARK-269 - Pre-Install Playbook tasks/pre.third_party_check.yml logic flawed
+  - SAS Multi-Machine Service Utilties
+    - VIYAARK-260 - Address GitHub issue [#86](https://github.com/sassoftware/viya-ark/issues/86)
+  - 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**:
   Enhancement of RHEL8 compatibility libraries installation.  Dropping unused feature.  README updates.
@@ -10,7 +26,7 @@
     - VIYAARK-241 - Install missing RHEL8 compatibility libraries
   - SAS LDAP Validator
     - VIYAARK-185 - Address GitHub issue [#20](https://github.com/sassoftware/viya-ark/issues/20) - anonymousBind usage update
-<!-- LATEST RELEASE END -->
+- Ansible Support: Ansible 2.8 - Ansible 2.10  
 
 ## Viya35-ark-1.13 - March 23, 2021
 - **Sumary**:
@@ -23,6 +39,7 @@
     - VIYAARK-204 - Make yum cachedir path customizable.
   - SAS Viya Deployment Report
     - VIYAARK-242 - Deployment Report not reporting the status of "not ready" services.
+- Ansible Support: Ansible 2.8 - Ansible 2.10
 
 ## Viya35-ark-1.12 - February 16, 2021 
 - **Summary**:

playbooks/merge-playbook/README.md

@@ -10,7 +10,7 @@ The differences between the current and newer inventory files are written to ```
 The playbook will copy the default inventory.ini and vars.yml from the playbook root directory to a time-stamped folder and then update them with the merged information included so that they are ready to use. If your inventory file and vars.yml include a new host group value ```? choose-target-host```, you must manually replace that value to avoid Ansible warnings and failures.
 
 ## Requirements for running the Playbook
-* Install "ruamel.yaml" in your Python installation by running `pip install ruamel.yaml`
+* 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 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:

playbooks/merge-playbook/library/merge_viya_deployment_files.py

@@ -322,7 +322,7 @@ def merge_inventory_ini(current_inventory, new_inventory, merge_default_host):
         # save the current hosts for the commandline section
         if 'CommandLine' == section:
             for option in current_inventory.options(section):
-                if cmdline_hosts is not '':
+                if type(cmdline_hosts) is not str:
                     cmdline_hosts = cmdline_hosts + '\n' + option.split(' ', 1)[0]
                 else:
                     cmdline_hosts = option.split(' ', 1)[0]

playbooks/pre-install-playbook/roles/viya-ark.preinstall/defaults/main.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2021, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2019-2022, 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.8"
-required_ansible_max_version: "2.10"
-ansible_version_compare_max_version: "2.11"  # Must be set one major version above required_ansible_max_version
-required_python_min_version: "2.6"
+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"
 
 
 

playbooks/pre-install-playbook/roles/viya-ark.preinstall/tasks/pre.third_party_check.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+# Copyright (c) 2019-2022, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 ---
@@ -29,7 +29,7 @@
   - name: Assert at least the minimum version of Python is used.
     assert:
       that:
-        - ansible_python_version is version(required_python_min_version, '>')
+        - 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}}."
     tags:

playbooks/viya-mmsu/README.md

@@ -1,9 +1,11 @@
 # SAS Viya Administration Resource Kit (SAS Viya ARK) - SAS Viya Multi-Machine Services Utilities (MMSU) Playbooks 
 
 ## Introduction
+
 The SAS Viya Multi-Machine Services Utilities repository contains a set of playbooks to start or stop the SAS Viya services gracefully across the 1 - n machines that are identified in the inventory.ini file.
 
 ## Requirements for Running the MMSU Playbooks
+
 * All services must have an Up status after the deployment has completed.
   See "Running the Playbooks" for instructions on listing the status of SAS Viya services.
 * The MMSU playbooks must be placed under the sas_viya_playbook directory where SAS Viya was deployed.
@@ -13,15 +15,18 @@ The SAS Viya Multi-Machine Services Utilities repository contains a set of playb
 * sas-viya-all-services script should not be run manually on any machines when using MMSU playbooks.
 
 ## Supported deployment of MMSU Playbooks
+
 * Single-machine deployment
 * Multi-machines deployment
 * Multi-tenant deployment
 * Clustered database deployment
 
-## UnSupported Viya deployment
+## Unsupported Viya Deployment
+
 * Programming-only deployment
 
 ## Running the Playbooks
+
 To list the status of all SAS Viya services and URLs, execute:
 ```
 ansible-playbook viya-ark/playbooks/viya-mmsu/viya-services-status.yml
@@ -43,7 +48,23 @@ To restart all services gracefully, execute:
 ansible-playbook viya-ark/playbooks/viya-mmsu/viya-services-restart.yml
 ```
 
+## Notes about the systemctl status Command
+
+The SAS Viya MMSU tool uses SAS Viya Postgres HA (high availability) to start the SAS Infrastructure Data Server services. It does not use systemctl. Hence, the command systemctl status may not report correctly for the following services:
+
+```
+sas-viya-sasdatasvrc-postgres-nodeX
+sas-viya-sasdatasvrc-postgres-nodeX-consul-template-operation_node
+sas-viya-sasdatasvrc-postgres-nodeX-consul-template-pg_hba
+sas-viya-sasdatasvrc-postgres-pgpoolX
+sas-viya-sasdatasvrc-postgres-pgpoolX-consul-template-operation_node
+sas-viya-sasdatasvrc-postgres-pgpoolX-consul-template-pool_hba
+```
+
+IMPORTANT The systemctl command does not provide a status of a service that it did not start.
+
 ## Tips
+
 * When running playbook viya-services-stop.yml and seeing sas stray processes:
 ```
     "msg": [
@@ -83,5 +104,5 @@ ansible-playbook viya-ark/playbooks/viya-mmsu/viya-services-restart.yml
 ```
   Note: if an order contains Common Planning Service (CPS), you will not be able to use the alternative method.
 
-Copyright (c) 2019-2021, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+Copyright (c) 2019-2022, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0