Merge pull request #127 from cyberark/develop

v13.0

Author: ggalfrin

defaults/main.yml

@@ -13,7 +13,7 @@ psm_exists: false
 psm_hardened: false
 psm_registered: false
 
-psm_service_name: "Cyber-Ark Privileged Session Manager"
+psm_service_name: "CyberArk Privileged Session Manager"
 
 psm_base_bin_drive: "C:"
 psm_extract_folder: "{{ psm_base_bin_drive }}\\Cyberark\\packages"

tasks/psm_prerequisites.yml

@@ -1,6 +1,17 @@
 ---
 # tasks file for psm prerequisities
 
+- name: Install .NET Framework 4.8
+  win_chocolatey:
+    name: dotnetfx
+    state: present
+  register: dotnetfx_response
+
+- name: Reboot host if required
+  win_reboot:
+    reboot_timeout: 300
+  when: dotnetfx_response.rc == 3010
+
 - name: Update NLA & UpdateRDSSecurityLayer installation
   win_shell: |
     try

tests/default.yml

@@ -7,37 +7,15 @@
     - name: Get roles directory dirname
       set_fact:
         roles_dirname: "{{ playbook_dir | dirname | basename }}"
-        dotnet_installer_path: "C:\\ndp48-x86-x64-allos-enu.exe"
-
-    - name: Download .NET Framework 4.8
-      win_get_url:
-        url: https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0fd66638cde16859462a6243a4629a50/ndp48-x86-x64-allos-enu.exe
-        dest: "{{ dotnet_installer_path }}"
-
-    - name: Install Microsoft .NET Framework 4.8
-      win_package:
-        path: "{{ dotnet_installer_path }}"
-        product_id: '{50e73eb2-10f7-4457-954a-6b06fccc7d04}'
-        arguments: /q /norestart
-      register: dotnet_install
-
-    - name: Delete .NET Framework Installer
-      win_file:
-        path: "{{ dotnet_installer_path }}"
-        state: absent
 
     - name: download package from s3
       aws_s3:
         bucket: cloud-initiatives-pipeline-bucket
-        object: "Packages/v12.6/Privileged Session Manager-Rls-v12.6.zip"
+        object: "Packages/v13.0/Privileged Session Manager-Rls-v13.0.zip"
         dest: "/tmp/psm.zip"
         mode: get
       delegate_to: localhost
 
-    - name: Reboot host if required
-      win_reboot:
-      when: dotnet_install.reboot_required
-
     - name: PSM Deployment
       include_role:
         name: "{{ roles_dirname }}"

tests/requirements.txt

@@ -1,32 +1,52 @@
-ansible==2.8.8
+adal==1.2.2
+ansible==2.9.5
 ansible-lint==4.2.0
+applicationinsights==0.11.9
+argcomplete==1.11.1
+bcrypt==3.1.7
 boto==2.49.0
-boto3==1.12.8
-botocore==1.15.8
+boto3==1.12.19
+botocore==1.15.19
 certifi==2019.11.28
 cffi==1.14.0
 chardet==3.0.4
+colorama==0.4.3
 cryptography==2.8
 docutils==0.15.2
+humanfriendly==8.1
 idna==2.9
+importlib-metadata==1.5.0
+isodate==0.6.0
 Jinja2==2.11.1
 jmespath==0.9.5
+knack==0.3.3
 MarkupSafe==1.1.1
+msrest==0.6.1
 ntlm-auth==1.4.0
+oauthlib==3.1.0
+packaging==20.3
+paramiko==2.7.1
 pathspec==0.7.0
 pyasn1==0.4.8
-pycparser==2.19
+pycparser==2.20
+Pygments==2.6.1
+PyJWT==1.7.1
+PyNaCl==1.3.0
 pyOpenSSL==19.1.0
+pyparsing==2.4.6
 python-dateutil==2.8.1
 pywinrm==0.4.1
 PyYAML==5.3
 requests==2.23.0
 requests-credssp==1.1.1
 requests-ntlm==1.1.0
+requests-oauthlib==1.3.0
 ruamel.yaml==0.16.10
 ruamel.yaml.clib==0.2.0
 s3transfer==0.3.3
 six==1.14.0
+tabulate==0.8.2
 urllib3==1.25.8
 xmltodict==0.12.0
 yamllint==1.20.0
+zipp==3.1.0

vars/main.yml

@@ -1,3 +1,3 @@
 ---
 # vars file for psm
-psm_sha1_checksum: "f876c7d40c98cac85639440a5c359311760db32d"
+psm_sha1_checksum: "e8262c0683e4815bd88fd94c1f3586ed53d0bf5b"