From a73ca9625550730f6e145daaaad35a66c77688a2 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Sun, 7 Jun 2015 21:25:15 +0000 Subject: [PATCH 1/6] Install bodhi2 from my copr for now --- roles/bodhi2/base/files/lmacken-bodhi2-epel-7.repo | 7 +++++++ roles/bodhi2/base/tasks/main.yml | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 roles/bodhi2/base/files/lmacken-bodhi2-epel-7.repo diff --git a/roles/bodhi2/base/files/lmacken-bodhi2-epel-7.repo b/roles/bodhi2/base/files/lmacken-bodhi2-epel-7.repo new file mode 100644 index 0000000000..73539d1d22 --- /dev/null +++ b/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 diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml index 2fb12907fa..db62cdea2f 100644 --- a/roles/bodhi2/base/tasks/main.yml +++ b/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 basic /etc/httpd/conf.d/ bodhi contents + 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: From 3f315543ecf7a9d1298d0b65cac70368b3898204 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Sun, 7 Jun 2015 21:27:28 +0000 Subject: [PATCH 2/6] Update a task name --- roles/bodhi2/base/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml index db62cdea2f..4f7ebd4cf7 100644 --- a/roles/bodhi2/base/tasks/main.yml +++ b/roles/bodhi2/base/tasks/main.yml @@ -2,7 +2,7 @@ # tasklist for setting up bodhi # This is the base set of files needed for bodhi -- name: setup basic /etc/httpd/conf.d/ bodhi contents +- name: setup the bodhi2 copr repo copy: > src="lmacken-bodhi2-epel-7.repo" dest="/etc/yum.repos.d/lmacken-bodhi2-epel-7.repo" From 9a80c55fb5964aba3d3af436197c01355c7b4c46 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Sun, 7 Jun 2015 22:05:16 +0000 Subject: [PATCH 3/6] Comment out this for a minute --- roles/bodhi2/base/tasks/main.yml | 41 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml index 4f7ebd4cf7..72bda0d89f 100644 --- a/roles/bodhi2/base/tasks/main.yml +++ b/roles/bodhi2/base/tasks/main.yml @@ -2,26 +2,27 @@ # 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: - - bodhi-server - tags: - - packages - - 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 +# - packages +# - bodhi +# +# +#- name: install needed packages +# yum: pkg={{ item }} state=present +# with_items: +# - bodhi-server +# tags: +# - packages +# - bodhi - name: setup /etc/bodhi/ directory file: path=/etc/bodhi owner=root group=root mode=0755 state=directory From c34d32b6f7952ca4cfa4ea9b91065a2a8a221f08 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Sun, 7 Jun 2015 22:15:42 +0000 Subject: [PATCH 4/6] Revert "Comment out this for a minute" This reverts commit 9a80c55fb5964aba3d3af436197c01355c7b4c46. --- roles/bodhi2/base/tasks/main.yml | 41 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml index 72bda0d89f..4f7ebd4cf7 100644 --- a/roles/bodhi2/base/tasks/main.yml +++ b/roles/bodhi2/base/tasks/main.yml @@ -2,27 +2,26 @@ # 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 -# - packages -# - bodhi -# -# -#- name: install needed packages -# yum: pkg={{ item }} state=present -# with_items: -# - bodhi-server -# tags: -# - packages -# - 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: + - bodhi-server + tags: + - packages + - bodhi - name: setup /etc/bodhi/ directory file: path=/etc/bodhi owner=root group=root mode=0755 state=directory From ffe7a3fa63a5f0b6e6d13fcd9694b26fc847d825 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Sun, 7 Jun 2015 22:51:41 +0000 Subject: [PATCH 5/6] Add a bodhi2 playbook --- playbooks/groups/bodhi2.yml | 52 +++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 playbooks/groups/bodhi2.yml diff --git a/playbooks/groups/bodhi2.yml b/playbooks/groups/bodhi2.yml new file mode 100644 index 0000000000..f54b708f71 --- /dev/null +++ b/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" From 520a9e4bcef4f13a25f080254d5bfc544d8a8ba2 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Mon, 8 Jun 2015 02:05:06 +0000 Subject: [PATCH 6/6] Try changing the bodhi2 path from /updates2 to /bodhi2 I think this might have been confusing cornice... --- playbooks/include/proxies-reverseproxy.yml | 2 +- roles/bodhi2/base/templates/staging.ini.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 6e6566939b..4fb1976187 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/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" diff --git a/roles/bodhi2/base/templates/staging.ini.j2 b/roles/bodhi2/base/templates/staging.ini.j2 index 4ced8942dd..b46f72f67a 100644 --- a/roles/bodhi2/base/templates/staging.ini.j2 +++ b/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