Skip to content

Commit 4c23513

Browse files
committed
ansible: upgrade softlayer Docker host
Upgrade the Softlayer Docker host from Ubuntu 18.04 to Ubuntu 22.04. Rename the host from "test-softlayer-ubuntu1804_docker-x64-1" to "test-ibm-ubuntu2204_docker-x64-1".
1 parent 6e61253 commit 4c23513

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

ansible/inventory.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ hosts:
179179
rhel8-x64-3: {ip: 52.117.26.13, build_test_v8: yes}
180180
ubuntu1804-x64-1: {ip: 52.117.26.14, alias: jenkins-workspace-6}
181181
ubuntu1804-x64-2: {ip: 50.97.245.9}
182+
ubuntu2204_docker-x64-1: {ip: 52.117.26.9}
182183

183184
- equinix_mnx:
184185
smartos18-x64-3: {ip: 147.28.162.102}
@@ -343,4 +344,3 @@ hosts:
343344
debian9-x64-1: {ip: 169.60.150.88}
344345
debian10-x64-1: {ip: 169.44.16.126}
345346
ubuntu1404-x64-1: {ip: 50.97.245.5}
346-
ubuntu1804_docker-x64-1: {ip: 52.117.26.9}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
3+
#
4+
# add Docker repo
5+
#
6+
7+
- name: "repo : add Ubuntu Docker repo key"
8+
ansible.builtin.apt_key:
9+
state: present
10+
url: https://download.docker.com/linux/ubuntu/gpg
11+
12+
- name: "repo : add Ubuntu Docker repo"
13+
ansible.builtin.apt_repository:
14+
repo: "deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable"
15+
register: has_updated_package_repo
16+
17+
- name: "repo : update apt cache"
18+
apt: update_cache=yes

ansible/roles/docker/vars/main.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ssh_config: /etc/ssh/sshd_config
99
sshd_service_name: 'sshd'
1010

1111
ntp_service: {
12-
systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804']
12+
systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804', 'ubuntu2204']
1313
}
1414

1515
common_packages: [
@@ -18,6 +18,9 @@ common_packages: [
1818
# you can either add os family or os to this list (see smartos)
1919
# but the playbook chooses os over family - not both
2020
packages: {
21+
ubuntu2204: [
22+
'docker.io',
23+
],
2124
ubuntu2004: [
2225
'docker.io',
2326
],

0 commit comments

Comments
 (0)