Merge branch 'master' of /git/ansible

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}}"

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"

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
 
 

roles/copr/backend/files/cron/restart_logstash.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/sh
-
-systemctl restart logstash &> /dev/nul

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"
 

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 }}

roles/copr/frontend/tasks/main.yml

@@ -27,7 +27,6 @@
   - "bash-completion"
   - "mod_ssl"
   - redis
-  - logstash
   tags:
   - packages
 
@@ -67,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
@@ -105,10 +97,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