From b12885240513138bc1d2df7a9029246c50be5070 Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Thu, 27 Oct 2022 20:36:41 +0000 Subject: [PATCH] Remove jenkins hosts --- group_vars/jenkins.yml | 8 ---- host_vars/jenkins01.home.foo.sh.yml | 6 --- hosts.yml | 5 -- playbooks/jenkins.yml | 25 ---------- playbooks/proxy.yml | 3 -- roles/jenkins/handlers/main.yml | 5 -- roles/jenkins/meta/main.yml | 3 -- roles/jenkins/tasks/main.yml | 72 ----------------------------- site.yml | 1 - 9 files changed, 128 deletions(-) delete mode 100644 group_vars/jenkins.yml delete mode 100644 host_vars/jenkins01.home.foo.sh.yml delete mode 100644 playbooks/jenkins.yml delete mode 100644 roles/jenkins/handlers/main.yml delete mode 100644 roles/jenkins/meta/main.yml delete mode 100644 roles/jenkins/tasks/main.yml diff --git a/group_vars/jenkins.yml b/group_vars/jenkins.yml deleted file mode 100644 index d500bf1..0000000 --- a/group_vars/jenkins.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -datadisks: - - {size: 100} - -firewall_in: - - {proto: tcp, port: 22, from: [172.20.20.0/22]} - - {proto: tcp, port: 443, from: [172.20.20.0/22]} - - {proto: tcp, port: 4949, from: [172.20.20.0/22]} diff --git a/host_vars/jenkins01.home.foo.sh.yml b/host_vars/jenkins01.home.foo.sh.yml deleted file mode 100644 index 16856f3..0000000 --- a/host_vars/jenkins01.home.foo.sh.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -vmhost: vmhost01.home.foo.sh -network_interfaces: - - device: eth0 - vlan: 20 - mac: "52:54:00:ac:dc:47" diff --git a/hosts.yml b/hosts.yml index 00cd411..e922ce5 100644 --- a/hosts.yml +++ b/hosts.yml @@ -23,9 +23,6 @@ git: influxdb: hosts: influxdb01.home.foo.sh: -jenkins: - hosts: - jenkins01.home.foo.sh: ldap: hosts: ldap01.home.foo.sh: @@ -110,7 +107,6 @@ webservers: adm: collab: git: - jenkins: ldap: mirror: munin: @@ -143,7 +139,6 @@ rocky8: collab: git: influxdb: - jenkins: ldap: minecraft: mirror: diff --git a/playbooks/jenkins.yml b/playbooks/jenkins.yml deleted file mode 100644 index 8412422..0000000 --- a/playbooks/jenkins.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- import_playbook: "include/deploy-kvm-guest.yml myhosts=jenkins" - -- name: configure instance - hosts: jenkins - user: root - gather_facts: true - - pre_tasks: - - name: mount /export - mount: - name: /export - src: LABEL=/export - fstype: xfs - opts: noatime,noexec,nosuid,nodev - passno: "0" - dump: "0" - state: mounted - - vars_files: - - "{{ ansible_private }}/vars.yml" - - roles: - - base - - jenkins diff --git a/playbooks/proxy.yml b/playbooks/proxy.yml index 015513f..b5a7b66 100644 --- a/playbooks/proxy.yml +++ b/playbooks/proxy.yml @@ -65,9 +65,6 @@ - role: nginx/site site: iot.foo.sh redirect: https://www.foo.sh/ - - role: nginx/site - site: jenkins.foo.sh - proxy: https://jenkins01.home.foo.sh/ - role: nginx/site site: munin.foo.sh proxy: https://munin01.home.foo.sh/ diff --git a/roles/jenkins/handlers/main.yml b/roles/jenkins/handlers/main.yml deleted file mode 100644 index ee1510c..0000000 --- a/roles/jenkins/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: restart jenkins - service: - name: jenkins - state: restarted diff --git a/roles/jenkins/meta/main.yml b/roles/jenkins/meta/main.yml deleted file mode 100644 index b95ceec..0000000 --- a/roles/jenkins/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - {role: nginx/server} diff --git a/roles/jenkins/tasks/main.yml b/roles/jenkins/tasks/main.yml deleted file mode 100644 index ebd502d..0000000 --- a/roles/jenkins/tasks/main.yml +++ /dev/null @@ -1,72 +0,0 @@ ---- -- name: add jenkins repository - yum_repository: - name: jenkins - description: Jenkins stable - baseurl: https://pkg.jenkins.io/redhat-stable - gpgcheck: true - gpgkey: https://pkg.jenkins.io/redhat-stable/jenkins.io.key - -- name: install packages - package: - name: "{{ item }}" - state: installed - with_items: - - jenkins - - java-11-openjdk - -- name: listen only to localhost - lineinfile: - path: /etc/sysconfig/jenkins - regexp: "^JENKINS_LISTEN_ADDRESS=.*" - line: "JENKINS_LISTEN_ADDRESS=localhost" - notify: restart jenkins - -- name: configure data directory - lineinfile: - path: /etc/sysconfig/jenkins - regexp: "^JENKINS_HOME=.*" - line: "JENKINS_HOME=/srv/jenkins" - notify: restart jenkins - -- name: create data directory - file: - path: /export/jenkins - state: directory - mode: 0750 - owner: jenkins - group: jenkins - -- name: link data directory - file: - dest: /srv/jenkins - src: /export/jenkins - state: link - owner: root - group: "{{ ansible_wheel }}" - follow: false - force: true - -- name: enable service - service: - name: jenkins - state: started - enabled: true - -- name: allow nginx to connect jenkins - seboolean: - name: httpd_can_network_connect - state: true - persistent: true - -- name: create nginx config - copy: - dest: "/etc/nginx/conf.d/{{ inventory_hostname }}/jenkins.conf" - content: | - location / { - proxy_pass http://localhost:8080/; - } - mode: 0644 - owner: root - group: "{{ ansible_wheel }}" - notify: restart nginx diff --git a/site.yml b/site.yml index 6e09ada..68c1711 100644 --- a/site.yml +++ b/site.yml @@ -5,7 +5,6 @@ - import_playbook: playbooks/fsol-gw.yml - import_playbook: playbooks/git.yml - import_playbook: playbooks/influxdb.yml -- import_playbook: playbooks/jenkins.yml - import_playbook: playbooks/ldap.yml - import_playbook: playbooks/log.yml - import_playbook: playbooks/mail.yml