You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2021/06/28 21:16:16 UTC
[couchdb-infra-cm] 01/01: Update PowerVS instance from CentOS 8 to
Ubuntu 20.04
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-infra-cm.git
commit 85b298b0a7bd6c76864e4de5aa50c08b0e021fc2
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Mon Jun 28 17:06:34 2021 -0400
Update PowerVS instance from CentOS 8 to Ubuntu 20.04
Ubuntu 20.04 is closer to Debian which we already use and CentOS will stop
1-to-1 comptable with RHEL soon enough.
---
production | 12 ++++++------
ssh.cfg | 6 +++---
tools/gen-config | 7 +++++--
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/production b/production
index 01109fd..30aea52 100644
--- a/production
+++ b/production
@@ -20,19 +20,19 @@ all:
ram: 4
ci_agents:
hosts:
- couchdb-ci:
+ couchdb-ci-ubuntu:
instance:
- created_at: '2021-06-08T17:10:52.000Z'
- id: 95088258-0fa4-4f3e-af56-abe57d647780
- name: couchdb-ci
+ created_at: '2021-06-28T20:34:05.000Z'
+ id: db57a004-c0b1-4aab-9420-e5b8aaaff468
+ name: couchdb-ci-ubuntu
profile: shared
subnet: null
vpc: s922
zone: none
ip_addrs:
bastion: null
- private: 192.168.150.155
- public: 158.175.161.155
+ private: 192.168.150.158
+ public: 158.175.161.158
system:
arch: power
num_cpu: 2
diff --git a/ssh.cfg b/ssh.cfg
index 6c451d9..9f7209c 100644
--- a/ssh.cfg
+++ b/ssh.cfg
@@ -7,9 +7,9 @@ Host couchdb-bastion-x86-64-debian-dal-1-01
ControlPath /tmp/ansible-%r@%h:%p
ControlPersist 30m
-Host couchdb-ci
- Hostname 158.175.161.155
- User root
+Host couchdb-ci-ubuntu
+ Hostname 158.175.161.158
+ User ubuntu
ForwardAgent yes
StrictHostKeyChecking no
ControlMaster auto
diff --git a/tools/gen-config b/tools/gen-config
index 0a6d708..b37cbf1 100755
--- a/tools/gen-config
+++ b/tools/gen-config
@@ -297,7 +297,7 @@ def write_ssh_cfg(filename, bastions, ci_agents):
bastion_tmpl = textwrap.dedent("""\
Host {host}
Hostname {ip_addr}
- User root
+ User {user}
ForwardAgent yes
StrictHostKeyChecking no
ControlMaster auto
@@ -308,7 +308,7 @@ def write_ssh_cfg(filename, bastions, ci_agents):
ci_agent_tmpl = textwrap.dedent("""\
Host {host}
Hostname {ip_addr}
- User root
+ User {user}
StrictHostKeyChecking no
ProxyCommand /usr/bin/ssh -F ./ssh.cfg -W %h:%p -q root@{bastion_ip}
ControlMaster auto
@@ -319,6 +319,7 @@ def write_ssh_cfg(filename, bastions, ci_agents):
with open(filename, "w") as handle:
for host, info in sorted(bastions.items()):
args = {
+ "user": "root",
"host": host,
"ip_addr": info["ip_addrs"]["public"]
}
@@ -328,12 +329,14 @@ def write_ssh_cfg(filename, bastions, ci_agents):
if info["system"]["arch"] == "power":
# Power systems use an external IP directly
args = {
+ "user": "ubuntu",
"host": host,
"ip_addr": info["ip_addrs"]["public"]
}
entry = bastion_tmpl.format(**args)
else:
args = {
+ "user": "root",
"host": host,
"ip_addr": info["ip_addrs"]["private"],
"bastion_ip": info["ip_addrs"]["bastion"]