Skip to content

Commit 8aac9e6

Browse files
authored
[Ubuntu] Update ansible-base to ansible-core (actions#3711)
Update ansible-base 2.10 to ansible-core 2.11 for Ubuntu images
1 parent e139c6d commit 8aac9e6

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
function Get-AnsibleVersion {
2-
$ansibleVersion = ansible --version | Select-Object -First 1 | Take-OutputPart -Part 1
2+
$ansibleVersion = (ansible --version)[0] -replace "[^\d.]"
33
return "Ansible $ansibleVersion"
44
}
55

images/linux/scripts/installers/pipx-packages.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ for package in $pipx_packages; do
1919
echo "Install $package into default python"
2020
pipx install $package
2121

22-
# Install ansible into an existing ansible-base Virtual Environment
23-
if [[ $package == "ansible-base" ]]; then
24-
pipx inject ansible-base ansible
22+
# https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html
23+
# Install ansible into an existing ansible-core Virtual Environment
24+
if [[ $package == "ansible-core" ]]; then
25+
pipx inject $package ansible
2526
fi
2627
fi
2728

images/linux/toolsets/toolset-1804.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
"cmd": "yamllint"
225225
},
226226
{
227-
"package": "ansible-base",
227+
"package": "ansible-core",
228228
"cmd": "ansible"
229229
}
230230
],

images/linux/toolsets/toolset-2004.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
"cmd": "yamllint"
225225
},
226226
{
227-
"package": "ansible-base",
227+
"package": "ansible-core",
228228
"cmd": "ansible"
229229
}
230230
],

0 commit comments

Comments
 (0)