diff options
4 files changed, 96 insertions, 105 deletions
diff --git a/playbooks/hosts/fedora-hubs-dev.yml b/playbooks/hosts/fedora-hubs-dev.yml deleted file mode 100644 index 73c0839ec..000000000 --- a/playbooks/hosts/fedora-hubs-dev.yml +++ /dev/null @@ -1,103 +0,0 @@ -- name: provision instance - hosts: 209.132.184.98 # this is transient.. so may change if we destroy it. - 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 - - tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - yum: name={{item}} state=present - with_items: - - git - - - file: dest=/srv/git state=directory - - git: repo=https://pagure.io/fedora-hubs.git - dest=/srv/git/fedora-hubs - version=develop - register: git_result - changed_when: "git_result.after|default('after') != git_result.before|default('before')" - - file: dest=/etc/fedmsg.d/ state=directory - - name: copy around a number of files we want - command: cp {{item.src}} {{item.dest}} - with_items: - - src: /srv/git/fedora-hubs/fedmsg.d/testconfig.py - dest: /etc/fedmsg.d/testconfig.py - remote_src: True - - src: /srv/git/fedora-hubs/fedmsg.d/base.py - dest: /etc/fedmsg.d/base.py - remote_src: True - - src: /srv/git/fedora-hubs/fedmsg.d/logging.py - dest: /etc/fedmsg.d/logging.py - remote_src: True - - src: /srv/git/fedora-hubs/systemd/hubs-worker@.service - dest: /usr/lib/systemd/system/hubs-worker@.service - remote_src: True - - src: /srv/git/fedora-hubs/systemd/hubs-triage@.service - dest: /usr/lib/systemd/system/hubs-triage@.service - remote_src: True - - src: /srv/git/fedora-hubs/systemd/hubs-webapp.service - dest: /usr/lib/systemd/system/hubs-webapp.service - remote_src: True - - yum: name={{item}} state=present - with_items: - - htop - - tmux - - vim - - redis - - python-pip - - gcc - - gcc-c++ - - sqlite-devel - - libffi-devel - - openssl-devel - - python-datanommer-consumer - - datanommer-commands - - fedmsg-hub - - python-psycopg2 - - postgresql-devel - - postgresql-server - - command: pip install -r requirements.txt - chdir=/srv/git/fedora-hubs - creates=/usr/lib/python2.7/site-packages/fedmsg/ - - # The one in epel7 is too old... :( - - command: pip install --upgrade pygments - - - command: pip install futures - creates=/usr/lib/python2.7/site-packages/concurrent/futures/ - - command: python setup.py develop - chdir=/srv/git/fedora-hubs - creates=/usr/lib/python2.7/site-packages/fedora-hubs.egg-link - - - command: systemctl daemon-reload - - - service: name={{item}} enabled=yes state=started - with_items: - - redis - - hubs-webapp - - hubs-worker@1 - - hubs-worker@2 - - hubs-worker@3 - - hubs-worker@4 - - hubs-worker@5 - - hubs-worker@6 - - hubs-worker@7 - - hubs-worker@8 - - hubs-triage@1 - - hubs-triage@2 - - hubs-triage@3 - - hubs-triage@4 - - hubs-triage@5 - - hubs-triage@6 - - - # Set up the db for datanommer - - command: postgresql-setup initdb creates=/var/lib/pgsql/data/pg_hba.conf - - service: name=postgresql enabled=yes state=started - # TODO -- createdb -E utf-8 datanommer - # TODO -- `datanommer-create-db` - - service: name=fedmsg-hub enabled=yes state=started diff --git a/playbooks/hosts/hubs-dev.fedorainfroacloud.org.yml b/playbooks/hosts/hubs-dev.fedorainfroacloud.org.yml index dc954d433..6297a5d2e 100644 --- a/playbooks/hosts/hubs-dev.fedorainfroacloud.org.yml +++ b/playbooks/hosts/hubs-dev.fedorainfroacloud.org.yml @@ -24,3 +24,97 @@ - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" + + tasks: + - include: "{{ tasks_path }}/yumrepos.yml" + - yum: name={{item}} state=present + with_items: + - git + + - file: dest=/srv/git state=directory + - git: repo=https://pagure.io/fedora-hubs.git + dest=/srv/git/fedora-hubs + version=develop + register: git_result + changed_when: "git_result.after|default('after') != git_result.before|default('before')" + - file: dest=/etc/fedmsg.d/ state=directory + - name: copy around a number of files we want + command: cp {{item.src}} {{item.dest}} + with_items: + - src: /srv/git/fedora-hubs/fedmsg.d/testconfig.py + dest: /etc/fedmsg.d/testconfig.py + remote_src: True + - src: /srv/git/fedora-hubs/fedmsg.d/base.py + dest: /etc/fedmsg.d/base.py + remote_src: True + - src: /srv/git/fedora-hubs/fedmsg.d/logging.py + dest: /etc/fedmsg.d/logging.py + remote_src: True + - src: /srv/git/fedora-hubs/systemd/hubs-worker@.service + dest: /usr/lib/systemd/system/hubs-worker@.service + remote_src: True + - src: /srv/git/fedora-hubs/systemd/hubs-triage@.service + dest: /usr/lib/systemd/system/hubs-triage@.service + remote_src: True + - src: /srv/git/fedora-hubs/systemd/hubs-webapp.service + dest: /usr/lib/systemd/system/hubs-webapp.service + remote_src: True + - yum: name={{item}} state=present + with_items: + - htop + - tmux + - vim + - redis + - python-pip + - gcc + - gcc-c++ + - sqlite-devel + - libffi-devel + - openssl-devel + - python-datanommer-consumer + - datanommer-commands + - fedmsg-hub + - python-psycopg2 + - postgresql-devel + - postgresql-server + - command: pip install -r requirements.txt + chdir=/srv/git/fedora-hubs + creates=/usr/lib/python2.7/site-packages/fedmsg/ + + # The one in epel7 is too old... :( + - command: pip install --upgrade pygments + + - command: pip install futures + creates=/usr/lib/python2.7/site-packages/concurrent/futures/ + - command: python setup.py develop + chdir=/srv/git/fedora-hubs + creates=/usr/lib/python2.7/site-packages/fedora-hubs.egg-link + + - command: systemctl daemon-reload + + - service: name={{item}} enabled=yes state=started + with_items: + - redis + - hubs-webapp + - hubs-worker@1 + - hubs-worker@2 + - hubs-worker@3 + - hubs-worker@4 + - hubs-worker@5 + - hubs-worker@6 + - hubs-worker@7 + - hubs-worker@8 + - hubs-triage@1 + - hubs-triage@2 + - hubs-triage@3 + - hubs-triage@4 + - hubs-triage@5 + - hubs-triage@6 + + + # Set up the db for datanommer + - command: postgresql-setup initdb creates=/var/lib/pgsql/data/pg_hba.conf + - service: name=postgresql enabled=yes state=started + # TODO -- createdb -E utf-8 datanommer + # TODO -- `datanommer-create-db` + - service: name=fedmsg-hub enabled=yes state=started diff --git a/roles/nagios_server/templates/nagios/hostgroups/checkswap.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/checkswap.cfg.j2 index 0975c8bcd..c9750a6c4 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/checkswap.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/checkswap.cfg.j2 @@ -1,6 +1,6 @@ define hostgroup { hostgroup_name CheckSwap alias Swap-Is-Low - members *, !status-fedora2, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !proxy05.fedoraproject.org, !mirrorlist-host1plus.fedoraproject.org, !download-rdu01.fedoraproject.org, !virthost-rdu01.fedoraproject.org, !fas3-01.stg.phx2.fedoraproject.org, !209.132.184.98, !osbs-control01.phx2.fedoraproject.org, {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %} {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} + members *, !status-fedora2, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !proxy05.fedoraproject.org, !mirrorlist-host1plus.fedoraproject.org, !download-rdu01.fedoraproject.org, !virthost-rdu01.fedoraproject.org, !fas3-01.stg.phx2.fedoraproject.org, !osbs-control01.phx2.fedoraproject.org, {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %} {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 index 8fcea2790..ab79d7646 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 @@ -1,6 +1,6 @@ define hostgroup { hostgroup_name nomail alias No Mail - members *, !status-fedora2, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !proxy05.fedoraproject.org, !mirrorlist-host1plus.fedoraproject.org, !download-rdu01.fedoraproject.org, !virthost-rdu01.fedoraproject.org, !fas3-01.stg.phx2.fedoraproject.org, !209.132.184.98, !osbs-control01.phx2.fedoraproject.org, {% for host in groups['bastion'] %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm'] %}!{{host}}, {% endfor %} {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %} {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} + members *, !status-fedora2, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !proxy05.fedoraproject.org, !mirrorlist-host1plus.fedoraproject.org, !download-rdu01.fedoraproject.org, !virthost-rdu01.fedoraproject.org, !fas3-01.stg.phx2.fedoraproject.org, !osbs-control01.phx2.fedoraproject.org, {% for host in groups['bastion'] %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm'] %}!{{host}}, {% endfor %} {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %} {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} } |