From 97b004a672d17820976ea8eac91b4dde8a6a4697 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Tue, 4 Feb 2020 05:26:22 -0800 Subject: [PATCH] ansible: move information about firewall config (#2149) Setting up the Firewall is one of the manual steps that must be done after ansibling a new Jenkins worker, so it should be in MANUAL_STEPS. --- ansible/MANUAL_STEPS.md | 19 +++++++++++++++++++ jenkins/doc/add-worker-firewall-entry.md | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) delete mode 100644 jenkins/doc/add-worker-firewall-entry.md diff --git a/ansible/MANUAL_STEPS.md b/ansible/MANUAL_STEPS.md index 384327d09..1d3f0199e 100644 --- a/ansible/MANUAL_STEPS.md +++ b/ansible/MANUAL_STEPS.md @@ -1,5 +1,6 @@ # Manual steps required to setup machines +* [Firewall Config](#adding-firewall-entries-for-jenkins-workers) * [Release machines](#release-*-machines) * [RHEL7-s390x](#RHEL7-s390x) * [V8 Build Tools](#V8-build-tools) @@ -22,6 +23,24 @@ * [NFS boot](#NFS-boot) +## Adding firewall entries for Jenkins workers + +Workers must be added to the firewall config before they will be able +to connect to the Jenkins master. + +You must be part of the infra group and have setup the ssh keys and config file +beforehand. + +To add an entry do the following: + +* ssh to the ci master: `ssh ci` +* save the current config to a temporary file: `iptables-save >foo` +* edit the temporary file with your favorite editor. Use one of + the existing lines as a template and add a new entry at the end + of the list of hosts just before the second `COMMIT` line near + the end of the file. +* restore the config from the temporary file: `iptables-restore foo` +* remove the temporary file: `rm foo` ## `release-*` machines diff --git a/jenkins/doc/add-worker-firewall-entry.md b/jenkins/doc/add-worker-firewall-entry.md deleted file mode 100644 index 086bd2d5d..000000000 --- a/jenkins/doc/add-worker-firewall-entry.md +++ /dev/null @@ -1,18 +0,0 @@ -# Adding firewall entries for jenkins workers - -Workers must be added to the firewall config before they will be able -to connect to the jenkins master. - -You must be part of the infra group and have setup the ssh -keys and config file beforehand. - -To add an entry do the following: - -* ssh to the ci master: `ssh ci` -* save the current config to a temporary file: `iptables-save >foo` -* edit the temporary file with your favorite editor. Use one of - the existing lines as a template and add a new entry at the end - of the list of hosts just before the second `COMMIT` line near - the end of the file. -* restore the config from the temporary file: `iptables-restore foo` -* remove the temporary file: `rm foo`