Merge branch 'master' of /git/ansible

playbooks/groups/bodhi2.yml

@@ -0,0 +1,52 @@
+- name: make bodhi2
+  hosts: bodhi2-stg
+  user: root
+  gather_facts: False
+
+  vars_files:
+  - /srv/web/infra/ansible/vars/global.yml
+  - "/srv/private/ansible/vars.yml"
+  - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  tasks:
+  - include: "{{ tasks }}/virt_instance_create.yml"
+
+  handlers:
+  - include: "{{ handlers }}/restart_services.yml"
+
+- name: make the box be real
+  hosts: bodhi2-stg
+  user: root
+  gather_facts: True
+
+  vars_files:
+  - /srv/web/infra/ansible/vars/global.yml
+  - "/srv/private/ansible/vars.yml"
+  - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+
+  roles:
+  - base
+  - rkhunter
+  - { role: denyhosts, when: ansible_distribution_major_version|int != 7 }
+  - nagios_client
+  - hosts
+  - fas_client
+  - sudo
+  - collectd/base
+  - rsyncd
+  - { role: openvpn/client,
+      when: env != "staging" }
+  - apache
+# TODO:
+  #- { role: fedmsg/base,  when: "inventory_hostname.startswith('bodhi0')" }
+  - { role: bodhi2/base, when: "inventory_hostname.startswith('bodhi0')" }
+
+  tasks:
+  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks }}/2fa_client.yml"
+  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks }}/mod_wsgi.yml"
+
+  handlers:
+  - include: "{{ handlers }}/restart_services.yml"

playbooks/include/proxies-reverseproxy.yml

@@ -219,7 +219,7 @@
     website: admin.fedoraproject.org
     destname: bodhi
     remotepath: /
-    localpath: /updates2
+    localpath: /bodhi2
     proxyurl: http://localhost:10010
     when: env == "staging"
 

roles/bodhi2/base/files/lmacken-bodhi2-epel-7.repo

@@ -0,0 +1,7 @@
+[lmacken-bodhi2]
+name=Copr repo for bodhi2 owned by lmacken
+baseurl=https://copr-be.cloud.fedoraproject.org/results/lmacken/bodhi2/epel-7-$basearch/
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://copr-be.cloud.fedoraproject.org/results/lmacken/bodhi2/pubkey.gpg
+enabled=1

roles/bodhi2/base/tasks/main.yml

@@ -2,6 +2,19 @@
 # tasklist for setting up bodhi
 # This is the base set of files needed for bodhi
 
+- name: setup the bodhi2 copr repo
+  copy: >
+    src="lmacken-bodhi2-epel-7.repo"
+    dest="/etc/yum.repos.d/lmacken-bodhi2-epel-7.repo"
+    owner=root
+    group=root
+    mode=0644
+  when: inventory_hostname.startswith('bodhi0')
+  tags:
+  - config
+  - bodhi
+
+
 - name: install needed packages
   yum: pkg={{ item }} state=present
   with_items:

roles/bodhi2/base/templates/staging.ini.j2

@@ -1,6 +1,6 @@
 [filter:proxy-prefix]
 use = egg:PasteDeploy#prefix
-prefix = /updates2
+prefix = /bodhi2
 scheme = https
 
 [app:main]
@@ -112,7 +112,7 @@ fedora_master_repomd = http://download.fedora.redhat.com/pub/fedora/linux/update
 fedora_epel_master_repomd = http://download.fedora.redhat.com/pub/epel/%d/i386/repodata/repomd.xml
 
 ## The base url of this application
-base_address = https://admin.stg.fedoraproject.org/updates2/
+base_address = https://admin.stg.fedoraproject.org/bodhi2/
 
 ## Supported update types
 update_types = bugfix enhancement security newpackage