diff --git a/inventory/cloud b/inventory/cloud index 7f638714d0..1e3fad206e 100644 --- a/inventory/cloud +++ b/inventory/cloud @@ -64,7 +64,6 @@ happinesspackets-stg.fedorainfracloud.org iddev.fedorainfracloud.org java-deptools.fedorainfracloud.org simple-koji-ci-prod.fedorainfracloud.org -lists-dev.fedorainfracloud.org libravatar.fedorainfracloud.org libravatar-stg.fedorainfracloud.org ppc64le-test.fedorainfracloud.org diff --git a/inventory/host_vars/lists-dev.fedorainfracloud.org b/inventory/host_vars/lists-dev.fedorainfracloud.org deleted file mode 100644 index 2ea58b3430..0000000000 --- a/inventory/host_vars/lists-dev.fedorainfracloud.org +++ /dev/null @@ -1,43 +0,0 @@ ---- -image: rhel7-20141015 -instance_type: m1.large -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,default,web-443-anywhere-persistent,all-icmp-persistent -zone: nova -tcp_ports: [22, 80, 443] - -inventory_tenant: persistent -inventory_instance_name: lists-dev -hostbase: lists-dev -public_ip: 209.132.184.180 -root_auth_users: abompard -description: lists development work -ansible_ifcfg_blacklist: true - -cloud_networks: - # persistent-net - - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" - -# Used by the mailman role -mailman_db_server: localhost -mailman_domains: -- lists-dev.fedorainfracloud.org -mailman_login: - gitlab: - display_name: GitLab - provider: gitlab - github: - display_name: GitHub - provider: github - twitter: - display_name: Twitter - provider: twitter - google: - display_name: Google - provider: google - facebook: - display_name: Facebook - provider: facebook - stackexchange: - display_name: StackExchange - provider: stackexchange diff --git a/inventory/inventory b/inventory/inventory index 8bf674cf04..bb7ff475df 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1016,8 +1016,6 @@ copr-be-dev.cloud.fedoraproject.org copr-fe-dev.cloud.fedoraproject.org # Fedora Bootstrap VM fedora-bootstrap.fedorainfracloud.org -# lists development instance -lists-dev.fedorainfracloud.org # java-deptools ticket 4846 java-deptools.fedorainfracloud.org # developer ticket 4876 diff --git a/master.yml b/master.yml index 1fe6cacc5d..19bfc1b0a7 100644 --- a/master.yml +++ b/master.yml @@ -119,7 +119,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/grobisplitter01.phx2.fedoraproject.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/iddev.fedorainfracloud.org.yml -- import_playbook: /srv/web/infra/ansible/playbooks/hosts/lists-dev.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/respins.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/testdays.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml deleted file mode 100644 index 8074ca9262..0000000000 --- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml +++ /dev/null @@ -1,176 +0,0 @@ -- name: check/create instance - hosts: lists-dev.fedorainfracloud.org - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - /srv/private/ansible/vars.yml - - /srv/web/infra/ansible/vars/fedora-cloud.yml - - /srv/private/ansible/files/openstack/passwords.yml - - tasks: - - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - -- name: setup all the things - hosts: lists-dev.fedorainfracloud.org - gather_facts: True - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - /srv/private/ansible/vars.yml - - /srv/private/ansible/files/openstack/passwords.yml - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - vars: - - tcp_ports: [22, 25, 80, 443] - - udp_ports: [] - - postfix_maincf: "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ inventory_hostname }}" - - pre_tasks: - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - - name: set hostname (required by some services, at least postfix need it) - hostname: name="{{inventory_hostname}}" - - roles: - - basessh - - sudo - - hosts - - mod_wsgi - - base - - tasks: - - import_tasks: "{{ tasks_path }}/postfix_basic.yml" - - import_tasks: "{{ tasks_path }}/motd.yml" - - # Basic Apache config - - name: install mod_ssl - package: name=mod_ssl state=present - - - name: copy ssl.conf - copy: src="{{ files }}/lists-dev/ssl.conf" dest=/etc/httpd/conf.d/ssl.conf - owner=root group=root mode=0644 - notify: - - reload httpd - - - name: basic apache virtualhost config - template: src="{{ files }}/lists-dev/apache.conf.j2" dest=/etc/httpd/conf.d/lists-dev.conf - owner=root group=root mode=0644 - notify: - - reload httpd - - # Database - - name: install postgresql server packages - package: name={{ item }} state=present - with_items: - - postgresql-server - - postgresql-contrib - - python-psycopg2 - - - name: initialize postgresql - command: /usr/bin/postgresql-setup initdb - creates=/var/lib/pgsql/data/postgresql.conf - - - name: copy pg_hba.conf - copy: src="{{ files }}/lists-dev/pg_hba.conf" dest=/var/lib/pgsql/data/pg_hba.conf - owner=postgres group=postgres - notify: - - restart postgresql - - - name: start postgresql - service: state=started enabled=yes name=postgresql - - - name: allow running sudo commands as postgresql for ansible - copy: src="{{ files }}/lists-dev/sudoers-norequiretty-postgres" dest=/etc/sudoers.d/norequiretty-postgres - owner=root group=root mode=0440 - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - - name: restart postgresql - service: name=postgresql state=restarted - - - -# -# Database setup -# - -- name: setup db users/passwords for mailman and hyperkitty - hosts: lists-dev.fedorainfracloud.org - gather_facts: no - become: yes - become_user: postgres - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" - - - tasks: - # mailman auto-updates its schema, there can only be one admin user - - name: mailman DB user - postgresql_user: name=mailmanadmin password={{ lists_dev_mm_db_pass }} - - name: hyperkitty DB admin user - postgresql_user: name=hyperkittyadmin password={{ lists_dev_hk_db_pass }} - - name: hyperkitty DB user - postgresql_user: name=hyperkittyapp password={{ lists_dev_hk_db_pass }} - - name: databases creation - postgresql_db: name={{ item }} owner="{{ item }}admin" encoding=UTF-8 - with_items: - - mailman - - hyperkitty - - name: test database creation - postgresql_db: name=test_hyperkitty owner=hyperkittyadmin encoding=UTF-8 - - -- name: setup mailman and hyperkitty - hosts: lists-dev.fedorainfracloud.org - gather_facts: True - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" - - roles: - - role: mailman - mailman_db_server: localhost - mailman_mailman_db_pass: "{{ lists_dev_mm_db_pass }}" - mailman_hyperkitty_admin_db_pass: "{{ lists_dev_hk_db_pass }}" - mailman_hyperkitty_db_pass: "{{ lists_dev_hk_db_pass }}" - mailman_hyperkitty_cookie_key: "randomstringusedasacookiesecurekey-yesthisshouldbeinaprivaterepo_butidonthaveaccesstoit" - - collectd/base - - tasks: - - - name: install more needed packages - package: name={{ item }} state=present - with_items: - - tar - - vim - - tmux - - patch - tags: - - packages - - #- name: easy access to the postgresql databases - # template: src="{{ files }}/lists-dev/pgpass.j2" dest=/root/.pgpass - # owner=root group=root mode=0600 - - - name: send root mail to abompard - lineinfile: dest=/etc/aliases regexp='^root:' line="root:abompard@fedoraproject.org" - notify: - - reload aliases - - - name: start services - service: state=started enabled=yes name={{ item }} - with_items: - - httpd - - mailman3 - - postfix - - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - - name: reload aliases - command: newaliases