remove zanata2fedmsg. the zanata roles are still there for the time being as they are tied into webstizes and such
This commit is contained in:
Stephen Smoogen
parent
a6d987bc9e
commit
257a130bc8
11 changed files with 0 additions and 183 deletions
|
|
@ -1,21 +0,0 @@
|
||||||
---
|
|
||||||
nm: 255.255.255.0
|
|
||||||
gw: 10.5.128.254
|
|
||||||
dns: 10.5.126.21
|
|
||||||
|
|
||||||
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
|
|
||||||
ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
|
|
||||||
volgroup: /dev/vg_guests
|
|
||||||
vmhost: virthost01.stg.phx2.fedoraproject.org
|
|
||||||
datacenter: phx2
|
|
||||||
|
|
||||||
tcp_ports: ['80']
|
|
||||||
|
|
||||||
eth0_ip: 10.5.128.189
|
|
||||||
csi_relationship: |
|
|
||||||
zanata2fedmsg is a tiny webapp that receives a webhook POST from
|
|
||||||
fedora.zanata.org and then republishes that data to our fedmsg bus.
|
|
||||||
|
|
||||||
It also has a cronjob that periodically wakes up, logs into
|
|
||||||
fedora.zanata.org and adds our webhook URL to all projects where it is
|
|
||||||
absent.
|
|
||||||
|
|
@ -639,7 +639,6 @@ vmhost-x86-08.stg.iad2.fedoraproject.org
|
||||||
vmhost-x86-09.stg.iad2.fedoraproject.org
|
vmhost-x86-09.stg.iad2.fedoraproject.org
|
||||||
vmhost-x86-10.stg.iad2.fedoraproject.org
|
vmhost-x86-10.stg.iad2.fedoraproject.org
|
||||||
# wiki01.stg.iad2.fedoraproject.org
|
# wiki01.stg.iad2.fedoraproject.org
|
||||||
# zanata2fedmsg01.stg.iad2.fedoraproject.org
|
|
||||||
|
|
||||||
# This is a list of hosts that are a little "friendly" with staging.
|
# This is a list of hosts that are a little "friendly" with staging.
|
||||||
# They are exempted from the iptables wall between staging and prod.
|
# They are exempted from the iptables wall between staging and prod.
|
||||||
|
|
@ -720,11 +719,6 @@ qvmhost-x86-02.iad2.fedoraproject.org
|
||||||
wiki01.iad2.fedoraproject.org
|
wiki01.iad2.fedoraproject.org
|
||||||
wiki02.iad2.fedoraproject.org
|
wiki02.iad2.fedoraproject.org
|
||||||
|
|
||||||
[zanata2fedmsg_stg]
|
|
||||||
# zanata2fedmsg01.stg.iad2.fedoraproject.org
|
|
||||||
|
|
||||||
[zanata2fedmsg]
|
|
||||||
|
|
||||||
# assorted categories of fedmsg services, for convenience
|
# assorted categories of fedmsg services, for convenience
|
||||||
[fedmsg_hubs:children]
|
[fedmsg_hubs:children]
|
||||||
badges_backend
|
badges_backend
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,6 @@
|
||||||
- import_playbook: /srv/web/infra/ansible/playbooks/groups/value.yml
|
- import_playbook: /srv/web/infra/ansible/playbooks/groups/value.yml
|
||||||
- import_playbook: /srv/web/infra/ansible/playbooks/groups/virthost.yml
|
- import_playbook: /srv/web/infra/ansible/playbooks/groups/virthost.yml
|
||||||
- import_playbook: /srv/web/infra/ansible/playbooks/groups/wiki.yml
|
- import_playbook: /srv/web/infra/ansible/playbooks/groups/wiki.yml
|
||||||
- import_playbook: /srv/web/infra/ansible/playbooks/groups/zanata2fedmsg.yml
|
|
||||||
####
|
####
|
||||||
#
|
#
|
||||||
# Openshift apps
|
# Openshift apps
|
||||||
|
|
|
||||||
|
|
@ -1,60 +0,0 @@
|
||||||
# create a new zanata2fedmsg server
|
|
||||||
# NOTE: should be used with --limit most of the time
|
|
||||||
# NOTE: make sure there is room/space for this server on the vmhost
|
|
||||||
# NOTE: most of these vars_path come from group_vars/zanata2fedmsg* or from hostvars
|
|
||||||
|
|
||||||
- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=zanata2fedmsg:zanata2fedmsg_stg"
|
|
||||||
|
|
||||||
- name: make the box be real
|
|
||||||
hosts: zanata2fedmsg:zanata2fedmsg_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
|
|
||||||
- nagios_client
|
|
||||||
- hosts
|
|
||||||
- fas_client
|
|
||||||
- collectd/base
|
|
||||||
- rsyncd
|
|
||||||
- sudo
|
|
||||||
- { role: openvpn/client,
|
|
||||||
when: env != "staging" }
|
|
||||||
- mod_wsgi
|
|
||||||
|
|
||||||
pre_tasks:
|
|
||||||
- import_tasks: "{{ tasks_path }}/yumrepos.yml"
|
|
||||||
|
|
||||||
tasks:
|
|
||||||
- import_tasks: "{{ tasks_path }}/2fa_client.yml"
|
|
||||||
- import_tasks: "{{ tasks_path }}/motd.yml"
|
|
||||||
|
|
||||||
handlers:
|
|
||||||
- import_tasks: "{{ handlers_path }}/restart_services.yml"
|
|
||||||
|
|
||||||
- name: deploy service-specific config
|
|
||||||
hosts: zanata2fedmsg:zanata2fedmsg_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
|
|
||||||
|
|
||||||
handlers:
|
|
||||||
- import_tasks: "{{ handlers_path }}/restart_services.yml"
|
|
||||||
|
|
||||||
roles:
|
|
||||||
- zanata2fedmsg
|
|
||||||
- { role: fedmsg/base,
|
|
||||||
when: deployment_type == "prod" }
|
|
||||||
# Set up for fedora-messaging
|
|
||||||
- { role: rabbit/user,
|
|
||||||
username: "zanata{{ env_suffix }}"}
|
|
||||||
|
|
@ -385,13 +385,6 @@
|
||||||
header_scheme: true
|
header_scheme: true
|
||||||
tags: pdc
|
tags: pdc
|
||||||
|
|
||||||
- role: httpd/reverseproxy
|
|
||||||
website: apps.fedoraproject.org
|
|
||||||
destname: zanata2fedmsg
|
|
||||||
localpath: /zanata2fedmsg
|
|
||||||
remotepath: /zanata2fedmsg
|
|
||||||
proxyurl: http://localhost:10046
|
|
||||||
|
|
||||||
- role: httpd/reverseproxy
|
- role: httpd/reverseproxy
|
||||||
website: admin.fedoraproject.org
|
website: admin.fedoraproject.org
|
||||||
destname: yk-val
|
destname: yk-val
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,6 @@
|
||||||
- endpoints-mailman.py
|
- endpoints-mailman.py
|
||||||
- endpoints-fedimg.py
|
- endpoints-fedimg.py
|
||||||
- endpoints-bugzilla2fedmsg.py
|
- endpoints-bugzilla2fedmsg.py
|
||||||
- endpoints-bodhi.py
|
|
||||||
- endpoints-odcs-backend.py
|
- endpoints-odcs-backend.py
|
||||||
- relay.py
|
- relay.py
|
||||||
- logging.py
|
- logging.py
|
||||||
|
|
|
||||||
|
|
@ -235,14 +235,6 @@ backend pdc-backend
|
||||||
timeout server 3600000
|
timeout server 3600000
|
||||||
timeout connect 3600000
|
timeout connect 3600000
|
||||||
|
|
||||||
frontend zanata2fedmsg-frontend
|
|
||||||
bind 0.0.0.0:10046
|
|
||||||
default_backend zanata2fedmsg-backend
|
|
||||||
|
|
||||||
backend zanata2fedmsg-backend
|
|
||||||
balance hdr(appserver)
|
|
||||||
server zanata2fedmsg01 zanata2fedmsg01:80 check inter 10s rise 1 fall 2
|
|
||||||
|
|
||||||
frontend osbs-frontend
|
frontend osbs-frontend
|
||||||
bind 0.0.0.0:10047
|
bind 0.0.0.0:10047
|
||||||
default_backend osbs-backend
|
default_backend osbs-backend
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
import sys
|
|
||||||
sys.stdout = sys.stderr
|
|
||||||
|
|
||||||
import os
|
|
||||||
os.environ['PYTHON_EGG_CACHE'] = '/var/www/.python-eggs'
|
|
||||||
os.environ['ZANATA2FEDMSG_CONFIG'] = '/etc/zanata2fedmsg.ini'
|
|
||||||
|
|
||||||
import logging
|
|
||||||
logging.basicConfig(level='INFO')
|
|
||||||
|
|
||||||
from zanata2fedmsg import app as application
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
||||||
---
|
|
||||||
# Configuration for the tahrir webapp
|
|
||||||
|
|
||||||
- name: install needed packages
|
|
||||||
package: name={{ item }} state=present enablerepo=epel-testing
|
|
||||||
with_items:
|
|
||||||
- python-zanata2fedmsg
|
|
||||||
- libsemanage-python
|
|
||||||
tags:
|
|
||||||
- packages
|
|
||||||
- zanata2fedmsg
|
|
||||||
|
|
||||||
- name: make some directories
|
|
||||||
file: dest="{{item}}" mode=0755 state=directory
|
|
||||||
with_items:
|
|
||||||
- /usr/share/zanata2fedmsg
|
|
||||||
tags:
|
|
||||||
- zanata2fedmsg
|
|
||||||
|
|
||||||
- name: copy zanata2fedmsg configuration file
|
|
||||||
template: >
|
|
||||||
src={{ item }} dest="/etc/{{item}}"
|
|
||||||
owner=apache group=apache mode=0640
|
|
||||||
with_items:
|
|
||||||
- zanata2fedmsg.ini
|
|
||||||
tags:
|
|
||||||
- config
|
|
||||||
- zanata2fedmsg
|
|
||||||
notify:
|
|
||||||
- restart apache
|
|
||||||
|
|
||||||
- name: copy zanata2fedmsg wsgi script
|
|
||||||
copy: >
|
|
||||||
src={{ item }} dest="/usr/share/zanata2fedmsg/{{ item }}"
|
|
||||||
owner=apache group=apache mode=0644
|
|
||||||
with_items:
|
|
||||||
- zanata2fedmsg.wsgi
|
|
||||||
tags:
|
|
||||||
- config
|
|
||||||
- zanata2fedmsg
|
|
||||||
notify:
|
|
||||||
- restart apache
|
|
||||||
|
|
||||||
- name: copy zanata2fedmsg httpd config
|
|
||||||
template: >
|
|
||||||
src={{ item }} dest="/etc/httpd/conf.d/{{ item }}"
|
|
||||||
owner=apache group=apache mode=0644
|
|
||||||
with_items:
|
|
||||||
- zanata2fedmsg.conf
|
|
||||||
tags:
|
|
||||||
- config
|
|
||||||
- zanata2fedmsg
|
|
||||||
notify:
|
|
||||||
- restart apache
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
WSGIDaemonProcess zanata2fedmsg user=apache group=apache maximum-requests=1000 display-name=zanata2fedmsg processes={{wsgi_procs}} threads={{wsgi_threads}}
|
|
||||||
WSGISocketPrefix run/wsgi
|
|
||||||
WSGIRestrictStdout On
|
|
||||||
WSGIRestrictSignal Off
|
|
||||||
WSGIPythonOptimize 1
|
|
||||||
|
|
||||||
WSGIScriptAlias /zanata2fedmsg /usr/share/zanata2fedmsg/zanata2fedmsg.wsgi
|
|
||||||
|
|
||||||
<Location /zanata2fedmsg>
|
|
||||||
WSGIProcessGroup zanata2fedmsg
|
|
||||||
Require all granted
|
|
||||||
</Location>
|
|
||||||
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
WEBHOOK_SALT = '{{zanata2fedmsg_webhook_salt}}'
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue