From a857e056671520c60f4345a4cda1ee8110f97a4e Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Mon, 29 Jun 2020 12:23:37 +1000 Subject: [PATCH] try 20.04 docker host --- ansible/inventory.yml | 4 ++-- ansible/roles/baselayout/vars/main.yml | 2 +- ansible/roles/docker/vars/main.yml | 2 +- ansible/roles/jenkins-worker/vars/main.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 6ec1ba893..a1ec0b995 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -116,8 +116,8 @@ hosts: ubuntu1604-x86-2: {ip: 104.131.191.135} ubuntu1804_docker-x64-1: {ip: 134.209.55.216} ubuntu1804_docker-x64-2: {ip: 159.89.183.200} - ubuntu1910_docker-x64-1: {ip: 167.71.99.4} - ubuntu1910_docker-x64-2: {ip: 159.203.120.157} + ubuntu2004_docker-x64-1: {ip: 167.71.99.4} + ubuntu2004_docker-x64-2: {ip: 159.203.120.157} ubuntu1804-x64-1: {ip: 178.128.181.213} - ibm: diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index b12d213eb..e662b5011 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -23,7 +23,7 @@ sshd_service_map: { sshd_service_name: "{{ sshd_service_map[os]|default(sshd_service_map[os|stripversion])|default('sshd') }}" ntp_service: { - systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804', 'ubuntu1904'], + systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804', 'ubuntu2004'], ntp_package: ['ubuntu1404'] } diff --git a/ansible/roles/docker/vars/main.yml b/ansible/roles/docker/vars/main.yml index 0b30bfcf6..97b06bc98 100644 --- a/ansible/roles/docker/vars/main.yml +++ b/ansible/roles/docker/vars/main.yml @@ -13,7 +13,7 @@ sshd_service_map: { sshd_service_name: "{{ sshd_service_map[os]|default(sshd_service_map[os|stripversion])|default('sshd') }}" ntp_service: { - systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804', 'ubuntu1904'], + systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804', 'ubuntu2004'], ntp_package: ['ubuntu1404'] } diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml index 8d8dc834c..495952a6c 100644 --- a/ansible/roles/jenkins-worker/vars/main.yml +++ b/ansible/roles/jenkins-worker/vars/main.yml @@ -12,7 +12,7 @@ init: { ibmi: 'ibmi72', macos: 'macos', rhel7: 'rhel7', - systemd: ['centos7', 'debian8', 'debian9', 'debian10', 'fedora', 'ubuntu1604', 'ubuntu1804', 'ubuntu1910'], + systemd: ['centos7', 'debian8', 'debian9', 'debian10', 'fedora', 'ubuntu1604', 'ubuntu1804', 'ubuntu2004'], svc: 'smartos', upstart: ['ubuntu12', 'ubuntu1404'], zos_start: 'zos'