From b11d96eb1a9f1c00e7512350f71a74ada1145acb Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 19 Jul 2017 16:43:22 +0000 Subject: [PATCH 1/7] ensure dnsmasq is installed on osbs hosts Signed-off-by: Adam Miller --- playbooks/groups/osbs-orchestrator-cluster.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml index 954442f092..edd4f12120 100644 --- a/playbooks/groups/osbs-orchestrator-cluster.yml +++ b/playbooks/groups/osbs-orchestrator-cluster.yml @@ -293,6 +293,11 @@ tasks: + - name: ensure dnsmasq is installed + package: + name: dnsmasq + state: latest + - name: install fedora dnsmasq specific config copy: src: "{{files}}/osbs/fedora-dnsmasq.conf.{{env}}" From 762d06787d52ae28c6cf8aa27ec1affe0c91d160 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Wed, 19 Jul 2017 17:00:39 +0000 Subject: [PATCH 2/7] magazine2: send WP trivial cron to /dev/null "...or maybe you shouldn't mail me every little piece of trash you happen to pick up." --- playbooks/hosts/magazine2.fedorainfracloud.org.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/hosts/magazine2.fedorainfracloud.org.yml b/playbooks/hosts/magazine2.fedorainfracloud.org.yml index bb4eb0f879..b681dff7d6 100644 --- a/playbooks/hosts/magazine2.fedorainfracloud.org.yml +++ b/playbooks/hosts/magazine2.fedorainfracloud.org.yml @@ -66,4 +66,4 @@ - name: Wordpress cron cron: name="Wordpress cron" minute="*/10" - job="curl http://localhost:8008/wp-cron.php" + job="curl http://localhost:8008/wp-cron.php >/dev/null" From 99a700be70bbc6d18a8f698c6297a98d9464fb88 Mon Sep 17 00:00:00 2001 From: clime Date: Wed, 19 Jul 2017 19:03:37 +0200 Subject: [PATCH 3/7] copr: no logstash --- roles/copr/backend/files/cron/restart_logstash.sh | 3 --- roles/copr/frontend/tasks/main.yml | 5 ----- 2 files changed, 8 deletions(-) delete mode 100644 roles/copr/backend/files/cron/restart_logstash.sh diff --git a/roles/copr/backend/files/cron/restart_logstash.sh b/roles/copr/backend/files/cron/restart_logstash.sh deleted file mode 100644 index d7f8748915..0000000000 --- a/roles/copr/backend/files/cron/restart_logstash.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/sh - -systemctl restart logstash &> /dev/nul diff --git a/roles/copr/frontend/tasks/main.yml b/roles/copr/frontend/tasks/main.yml index 81f0a08c81..d8fc0169de 100644 --- a/roles/copr/frontend/tasks/main.yml +++ b/roles/copr/frontend/tasks/main.yml @@ -27,7 +27,6 @@ - "bash-completion" - "mod_ssl" - redis - - logstash tags: - packages @@ -105,10 +104,6 @@ service: state=started enabled=yes name={{ item }} with_items: - httpd - - logstash - -- name: set acl for logstash to access httpd logs - acl: name=/var/log/httpd entity=logstash etype=user permissions=rx state=present - name: set dev banner for dev instance when: devel From c3acb7389a8e6c89a7b5772bed5938ded2ee3990 Mon Sep 17 00:00:00 2001 From: clime Date: Wed, 19 Jul 2017 19:18:01 +0200 Subject: [PATCH 4/7] copr-frontend: do not setup chroots from main.yml --- roles/copr/frontend/tasks/main.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/roles/copr/frontend/tasks/main.yml b/roles/copr/frontend/tasks/main.yml index d8fc0169de..6e67a6342b 100644 --- a/roles/copr/frontend/tasks/main.yml +++ b/roles/copr/frontend/tasks/main.yml @@ -66,13 +66,6 @@ args: chdir: /usr/share/copr/coprs_frontend/ -- name: set up chroots - command: ./manage.py create_chroot epel-5-i386 epel-5-x86_64 epel-6-i386 epel-6-x86_64 epel-7-x86_64 fedora-20-i386 fedora-20-x86_64 fedora-21-i386 fedora-21-x86_64 fedora-22-i386 fedora-22-x86_64 fedora-rawhide-i386 fedora-rawhide-x86_64 - become: yes - become_user: copr-fe - args: - chdir: /usr/share/copr/coprs_frontend/ - - name: set up admins command: ./manage.py alter_user --admin {{ item }} become: yes From f172a856181c76d4e069fd7243b38d95b3a6e3ce Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 19 Jul 2017 17:19:17 +0000 Subject: [PATCH 5/7] uncomment commented parts of ansible-ansible-openshift-ansible Signed-off-by: Adam Miller --- .../tasks/main.yml | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/roles/ansible-ansible-openshift-ansible/tasks/main.yml b/roles/ansible-ansible-openshift-ansible/tasks/main.yml index bf1ef9b613..da3902ee03 100644 --- a/roles/ansible-ansible-openshift-ansible/tasks/main.yml +++ b/roles/ansible-ansible-openshift-ansible/tasks/main.yml @@ -20,20 +20,18 @@ src: "cluster-inventory.j2" dest: "{{ openshift_ansible_path }}/{{ cluster_inventory_filename }}" -#- name: run ansible -# shell: "ansible-playbook {{ openshift_ansible_playbook }} -i {{ cluster_inventory_filename }}" -# args: -# chdir: "{{ openshift_ansible_path }}" -# register: run_ansible_out - -#- name: display run ansible stdout_lines -# debug: -# var: run_ansible_out.stdout_lines - -#- name: display run ansible stderr -# debug: -# var: run_ansible_out.stderr +- name: run ansible + shell: "ansible-playbook {{ openshift_ansible_playbook }} -i {{ cluster_inventory_filename }}" + args: + chdir: "{{ openshift_ansible_path }}" + register: run_ansible_out +- name: display run ansible stdout_lines + debug: + var: run_ansible_out.stdout_lines +- name: display run ansible stderr + debug: + var: run_ansible_out.stderr From 420205573a18888ab8ae0d85c10d015515f1f77e Mon Sep 17 00:00:00 2001 From: clime Date: Wed, 19 Jul 2017 19:20:11 +0200 Subject: [PATCH 6/7] copr-dist-git: remove no longer needed groups --- roles/copr/dist_git/tasks/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/roles/copr/dist_git/tasks/main.yml b/roles/copr/dist_git/tasks/main.yml index de470ed216..9052e7af60 100644 --- a/roles/copr/dist_git/tasks/main.yml +++ b/roles/copr/dist_git/tasks/main.yml @@ -3,12 +3,10 @@ # pre-create users/groups and copy uids/gids from the current prod copr-dist-git - group: name="packager" state=present gid=987 - group: name="copr-dist-git" state=present gid=1003 -- group: name="docker" state=present gid=1004 - group: name="apache" state=present gid=48 -- group: name="mock" state=present gid=135 - name: create user for git repos and copr-dist-git service - user: name="copr-dist-git" group=copr-dist-git groups=packager,docker,apache,mock uid=1002 + user: name="copr-dist-git" group=copr-dist-git groups=packager,apache uid=1002 - name: install packages dnf: state=present name={{ item }} From c968e00ebf8999c33d5db8b3c6972bb99cbbfced Mon Sep 17 00:00:00 2001 From: clime Date: Wed, 19 Jul 2017 19:24:08 +0200 Subject: [PATCH 7/7] copr-backend: remove commented out lines for setup of no longer used scripts --- roles/copr/backend/tasks/main.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 2270dbf4a8..deb1ffbbd2 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -181,19 +181,6 @@ - copy: src="cleanup_vms.sh" dest=/etc/cron.hourly/copr_cleanup_vms.sh mode=755 when: not devel -#- name: copy delete-forgotten-instances.pl -# copy: src="delete-forgotten-instances.pl" dest=/home/copr/delete-forgotten-instances.pl mode=755 - -#- name: copy delete-forgotten-instances.cron -# copy: src="delete-forgotten-instances.cron" dest=/etc/cron.daily/delete-forgotten-instances owner=root group=root mode=755 -# when: not devel - -#- name: install script to kill VMs in error state -# copy: src="instant-instance-killer.sh" dest="/root/" - -#- cron: name="kill VMs in error state" minute="*/15" job="/root/instant-instance-killer.sh" -# when: not devel - - name: setup monitoring include: "monitoring.yml"