From 8aac9e60c0434fd36c169406371199bcde3727f2 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
Date: Wed, 14 Jul 2021 12:23:24 +0300
Subject: [PATCH] [Ubuntu] Update ansible-base to ansible-core (#3711)

Update ansible-base 2.10 to ansible-core 2.11 for Ubuntu images
---
 .../linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +-
 images/linux/scripts/installers/pipx-packages.sh           | 7 ++++---
 images/linux/toolsets/toolset-1804.json                    | 2 +-
 images/linux/toolsets/toolset-2004.json                    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
index 202920a97..ae7ddfa6d 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
@@ -1,5 +1,5 @@
 function Get-AnsibleVersion {
-    $ansibleVersion = ansible --version | Select-Object -First 1 | Take-OutputPart -Part 1
+    $ansibleVersion = (ansible --version)[0] -replace "[^\d.]"
     return "Ansible $ansibleVersion"
 }
 
diff --git a/images/linux/scripts/installers/pipx-packages.sh b/images/linux/scripts/installers/pipx-packages.sh
index 85763b7d4..c5aeace65 100644
--- a/images/linux/scripts/installers/pipx-packages.sh
+++ b/images/linux/scripts/installers/pipx-packages.sh
@@ -19,9 +19,10 @@ for package in $pipx_packages; do
         echo "Install $package into default python"
         pipx install $package
 
-        # Install ansible into an existing ansible-base Virtual Environment
-        if [[ $package == "ansible-base" ]]; then
-            pipx inject ansible-base ansible
+        # https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html
+        # Install ansible into an existing ansible-core Virtual Environment
+        if [[ $package == "ansible-core" ]]; then
+            pipx inject $package ansible
         fi
     fi
 
diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index 0b9f04978..d672818cd 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -224,7 +224,7 @@
             "cmd": "yamllint"
         },
         {
-            "package": "ansible-base",
+            "package": "ansible-core",
             "cmd": "ansible"
         }
     ],
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index 2db8e7fe9..832335d35 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -224,7 +224,7 @@
             "cmd": "yamllint"
         },
         {
-            "package": "ansible-base",
+            "package": "ansible-core",
             "cmd": "ansible"
         }
     ],