Skip to content

Commit

Permalink
ansible: upgrade softlayer Docker host
Browse files Browse the repository at this point in the history
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".
  • Loading branch information
richardlau committed Jun 2, 2023
1 parent 896cbe1 commit 2c2a5b6
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ansible/inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ hosts:
rhel8-x64-3: {ip: 52.117.26.13, build_test_v8: yes}
ubuntu1804-x64-1: {ip: 52.117.26.14, alias: jenkins-workspace-6}
ubuntu1804-x64-2: {ip: 50.97.245.9}
ubuntu2204_docker-x64-1: {ip: 52.117.26.9}

- equinix_mnx:
smartos18-x64-3: {ip: 147.28.162.102}
Expand Down Expand Up @@ -343,4 +344,3 @@ hosts:
debian9-x64-1: {ip: 169.60.150.88}
debian10-x64-1: {ip: 169.44.16.126}
ubuntu1404-x64-1: {ip: 50.97.245.5}
ubuntu1804_docker-x64-1: {ip: 52.117.26.9}
18 changes: 18 additions & 0 deletions ansible/roles/docker/tasks/partials/repo/ubuntu2204.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---

#
# add Docker repo
#

- name: "repo : add Ubuntu Docker repo key"
ansible.builtin.apt_key:
state: present
url: https://download.docker.com/linux/ubuntu/gpg

- name: "repo : add Ubuntu Docker repo"
ansible.builtin.apt_repository:
repo: "deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable"
register: has_updated_package_repo

- name: "repo : update apt cache"
apt: update_cache=yes
5 changes: 4 additions & 1 deletion ansible/roles/docker/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ssh_config: /etc/ssh/sshd_config
sshd_service_name: 'sshd'

ntp_service: {
systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804']
systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804', 'ubuntu2204']
}

common_packages: [
Expand All @@ -18,6 +18,9 @@ common_packages: [
# you can either add os family or os to this list (see smartos)
# but the playbook chooses os over family - not both
packages: {
ubuntu2204: [
'docker.io',
],
ubuntu2004: [
'docker.io',
],
Expand Down

0 comments on commit 2c2a5b6

Please sign in to comment.