more include cleanups
This commit is contained in:
parent
07bc405e04
commit
a4ca0db30c
22 changed files with 51 additions and 51 deletions
|
@ -1,12 +1,12 @@
|
||||||
---
|
---
|
||||||
# Install additional packages
|
# Install additional packages
|
||||||
- include: install.yml
|
- include_tasks: install.yml
|
||||||
|
|
||||||
# Create database for faf
|
# Create database for faf
|
||||||
- include: setup_db.yml
|
- include_tasks: setup_db.yml
|
||||||
|
|
||||||
# Allow https and start httpd
|
# Allow https and start httpd
|
||||||
- include: services.yml
|
- include_tasks: services.yml
|
||||||
|
|
||||||
# landing page
|
# landing page
|
||||||
- name: install abrt-server-info-page
|
- name: install abrt-server-info-page
|
||||||
|
@ -79,5 +79,5 @@
|
||||||
tags: add_repo
|
tags: add_repo
|
||||||
with_items: "{{ faf_repos }}"
|
with_items: "{{ faf_repos }}"
|
||||||
|
|
||||||
- include: cron.yml
|
- include_tasks: cron.yml
|
||||||
tags: cron
|
tags: cron
|
||||||
|
|
|
@ -1,32 +1,32 @@
|
||||||
- include: install.yml
|
- include_tasks: install.yml
|
||||||
tags: [faf, faf_install, packages]
|
tags: [faf, faf_install, packages]
|
||||||
|
|
||||||
- include: update.yml
|
- include_tasks: update.yml
|
||||||
when: faf_update
|
when: faf_update
|
||||||
tags: [faf, faf_update, packages]
|
tags: [faf, faf_update, packages]
|
||||||
|
|
||||||
- include: first_time_setup.yml
|
- include_tasks: first_time_setup.yml
|
||||||
tags: [faf, faf_fist_time_setup, config]
|
tags: [faf, faf_fist_time_setup, config]
|
||||||
|
|
||||||
- include: config.yml
|
- include_tasks: config.yml
|
||||||
tags: [faf, faf_config, config]
|
tags: [faf, faf_config, config]
|
||||||
|
|
||||||
- include: migrate_db.yml
|
- include_tasks: migrate_db.yml
|
||||||
when: faf_migrate_db
|
when: faf_migrate_db
|
||||||
tags: [faf, faf_migrate_db]
|
tags: [faf, faf_migrate_db]
|
||||||
|
|
||||||
- include: cron.yml
|
- include_tasks: cron.yml
|
||||||
when: faf_cron_jobs
|
when: faf_cron_jobs
|
||||||
tags: [faf, config]
|
tags: [faf, config]
|
||||||
|
|
||||||
- include: web.yml
|
- include_tasks: web.yml
|
||||||
when: faf_with_web
|
when: faf_with_web
|
||||||
tags: [faf, faf_web]
|
tags: [faf, faf_web]
|
||||||
|
|
||||||
- include: check.yml
|
- include_tasks: check.yml
|
||||||
when: faf_check
|
when: faf_check
|
||||||
tags: [faf, faf_check]
|
tags: [faf, faf_check]
|
||||||
|
|
||||||
- include: check_web.yml
|
- include_tasks: check_web.yml
|
||||||
when: faf_check_web
|
when: faf_check_web
|
||||||
tags: [faf, faf_check_web]
|
tags: [faf, faf_check_web]
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
yum : name={{ item }} state=latest
|
yum : name={{ item }} state=latest
|
||||||
with_items: "{{ faf_web_packages }}"
|
with_items: "{{ faf_web_packages }}"
|
||||||
|
|
||||||
- include: celery.yml
|
- include_tasks: celery.yml
|
||||||
when: faf_with_celery
|
when: faf_with_celery
|
||||||
|
|
||||||
- name: install faf web symboltransfer packages
|
- name: install faf web symboltransfer packages
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
# Setup retrace-server
|
# Setup retrace-server
|
||||||
- include: retrace_setup.yml
|
- include_tasks: retrace_setup.yml
|
||||||
|
|
||||||
# Set up cron jobs for retrace-server
|
# Set up cron jobs for retrace-server
|
||||||
- include: cron.yml
|
- include_tasks: cron.yml
|
||||||
tags: cron
|
tags: cron
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
---
|
---
|
||||||
# Install retrace-server packages
|
# Install retrace-server packages
|
||||||
- include: install.yml
|
- include_tasks: install.yml
|
||||||
tags: [rs, packages]
|
tags: [rs, packages]
|
||||||
|
|
||||||
# Set up use of FAF packages
|
# Set up use of FAF packages
|
||||||
- include: usefafpkgs.yml
|
- include_tasks: usefafpkgs.yml
|
||||||
when: rs_use_faf_packages
|
when: rs_use_faf_packages
|
||||||
tags: [rs, use_faf_packages]
|
tags: [rs, use_faf_packages]
|
||||||
|
|
||||||
# Configure retrace-server
|
# Configure retrace-server
|
||||||
- include: config.yml
|
- include_tasks: config.yml
|
||||||
tags: [rs, config]
|
tags: [rs, config]
|
||||||
|
|
||||||
# Check functionality of the retrace-server
|
# Check functionality of the retrace-server
|
||||||
- include: check.yml
|
- include_tasks: check.yml
|
||||||
when: rs_check_health
|
when: rs_check_health
|
||||||
tags: [rs, check]
|
tags: [rs, check]
|
||||||
|
|
|
@ -119,7 +119,7 @@
|
||||||
tags:
|
tags:
|
||||||
- beaker-server
|
- beaker-server
|
||||||
|
|
||||||
- include: client.yml
|
- include_tasks: client.yml
|
||||||
|
|
||||||
- name: ensure beaker server has all relevant virthost ssh signatures in known_hosts
|
- name: ensure beaker server has all relevant virthost ssh signatures in known_hosts
|
||||||
lineinfile: dest=/root/.ssh/known_hosts regexp='{{ item.hostname }}' line='{{ item.hostname }} {{ item.signature }}' create=yes owner=root group=root
|
lineinfile: dest=/root/.ssh/known_hosts regexp='{{ item.hostname }}' line='{{ item.hostname }} {{ item.signature }}' create=yes owner=root group=root
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
---
|
---
|
||||||
- name: mount fs
|
- name: mount fs
|
||||||
include: "mount_fs.yml"
|
include_tasks: "mount_fs.yml"
|
||||||
|
|
||||||
- name: setup networking
|
- name: setup networking
|
||||||
include: "network.yml"
|
include_tasks: "network.yml"
|
||||||
|
|
||||||
# pre-create copr user and group with predefined uid and gid
|
# pre-create copr user and group with predefined uid and gid
|
||||||
- group: name=copr gid=986
|
- group: name=copr gid=986
|
||||||
|
@ -82,7 +82,7 @@
|
||||||
|
|
||||||
- name: install certificates for production
|
- name: install certificates for production
|
||||||
when: not devel
|
when: not devel
|
||||||
include: "install_certs.yml"
|
include_tasks: "install_certs.yml"
|
||||||
|
|
||||||
- name: allow lighttpd set fds limit
|
- name: allow lighttpd set fds limit
|
||||||
seboolean: name=httpd_setrlimit state=yes persistent=yes
|
seboolean: name=httpd_setrlimit state=yes persistent=yes
|
||||||
|
@ -167,7 +167,7 @@
|
||||||
|
|
||||||
- name: install cert to access fed-cloud09
|
- name: install cert to access fed-cloud09
|
||||||
# TODO: remove this when fed-cloud09 receives external cert
|
# TODO: remove this when fed-cloud09 receives external cert
|
||||||
include: install_cloud_cert.yml
|
include_tasks: install_cloud_cert.yml
|
||||||
|
|
||||||
- name: enable and run copr-backend services
|
- name: enable and run copr-backend services
|
||||||
service: name="{{ item }}" enabled=yes state=started
|
service: name="{{ item }}" enabled=yes state=started
|
||||||
|
@ -184,8 +184,8 @@
|
||||||
copy: src="logrotate/lighttpd" dest=/etc/logrotate.d/lighttpd owner=root group=root mode=644
|
copy: src="logrotate/lighttpd" dest=/etc/logrotate.d/lighttpd owner=root group=root mode=644
|
||||||
|
|
||||||
- name: setup monitoring
|
- name: setup monitoring
|
||||||
include: "monitoring.yml"
|
include_tasks: "monitoring.yml"
|
||||||
|
|
||||||
- name: setup fedmsg for MBS
|
- name: setup fedmsg for MBS
|
||||||
include: "fedmsg.yml"
|
include_tasks: "fedmsg.yml"
|
||||||
when: env == "staging"
|
when: env == "staging"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
- include: "{{ handlers_path }}/restart_services.yml"
|
- include_tasks: "{{ handlers_path }}/restart_services.yml"
|
||||||
|
|
||||||
- name: restart postgresql
|
- name: restart postgresql
|
||||||
service: name=postgresql state=restarted
|
service: name=postgresql state=restarted
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
|
|
||||||
|
|
||||||
# again to late to do it here
|
# again to late to do it here
|
||||||
# - include: "{{ tasks_path }}/cloud_setup_basic.yml"
|
# - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
|
||||||
# already included into the `base` role
|
# already included into the `base` role
|
||||||
#- include: "{{ tasks_path }}/postfix_basic.yml"
|
#- include_tasks: "{{ tasks_path }}/postfix_basic.yml"
|
||||||
|
|
||||||
# To late to do it here (
|
# To late to do it here (
|
||||||
#- name: setup correct hostname for copr machine
|
#- name: setup correct hostname for copr machine
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
- include: "mount_fs.yml"
|
- include_tasks: "mount_fs.yml"
|
||||||
|
|
||||||
# pre-create users/groups and copy uids/gids from the current prod copr-dist-git
|
# pre-create users/groups and copy uids/gids from the current prod copr-dist-git
|
||||||
- group: name="packager" state=present gid=987
|
- group: name="packager" state=present gid=987
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
- include: "{{ handlers_path }}/restart_services.yml"
|
- include_tasks: "{{ handlers_path }}/restart_services.yml"
|
||||||
|
|
||||||
- name: restart postgresql
|
- name: restart postgresql
|
||||||
service: name=postgresql
|
service: name=postgresql
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
- include: "mount_fs.yml"
|
- include_tasks: "mount_fs.yml"
|
||||||
|
|
||||||
- command: "ls -dZ /var/lib/pgsql"
|
- command: "ls -dZ /var/lib/pgsql"
|
||||||
register: pgsql_ls
|
register: pgsql_ls
|
||||||
|
@ -58,7 +58,7 @@
|
||||||
tags:
|
tags:
|
||||||
- config
|
- config
|
||||||
|
|
||||||
- include: "psql_setup.yml"
|
- include_tasks: "psql_setup.yml"
|
||||||
|
|
||||||
- name: upgrade db to head
|
- name: upgrade db to head
|
||||||
command: alembic upgrade head
|
command: alembic upgrade head
|
||||||
|
@ -89,7 +89,7 @@
|
||||||
chdir: /usr/share/copr/coprs_frontend/
|
chdir: /usr/share/copr/coprs_frontend/
|
||||||
|
|
||||||
- name: install ssl certificates for production
|
- name: install ssl certificates for production
|
||||||
include: "install_certs.yml"
|
include_tasks: "install_certs.yml"
|
||||||
when: not devel
|
when: not devel
|
||||||
tags:
|
tags:
|
||||||
- config
|
- config
|
||||||
|
|
|
@ -56,4 +56,4 @@
|
||||||
|
|
||||||
- name: setup backup
|
- name: setup backup
|
||||||
when: not devel
|
when: not devel
|
||||||
include: "setup_backup.yml"
|
include_tasks: "setup_backup.yml"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
- include: "{{ handlers_path }}/restart_services.yml"
|
- include_tasks: "{{ handlers_path }}/restart_services.yml"
|
||||||
|
|
||||||
- name: daemon reload
|
- name: daemon reload
|
||||||
command: systemctl daemon-reload
|
command: systemctl daemon-reload
|
||||||
|
|
|
@ -18,4 +18,4 @@
|
||||||
listen: "hubs configuration change"
|
listen: "hubs configuration change"
|
||||||
|
|
||||||
# Webserver
|
# Webserver
|
||||||
- include: webserver.yml
|
- include_tasks: webserver.yml
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
|
|
||||||
|
|
||||||
# Set up, create, and populate the database.
|
# Set up, create, and populate the database.
|
||||||
- include: db-{{ hubs_db_type }}.yml
|
- include_tasks: db-{{ hubs_db_type }}.yml
|
||||||
|
|
||||||
|
|
||||||
# Set up JavaScript requirements
|
# Set up JavaScript requirements
|
||||||
|
@ -196,5 +196,5 @@
|
||||||
|
|
||||||
|
|
||||||
# Webserver
|
# Webserver
|
||||||
- include: webserver.yml
|
- include_tasks: webserver.yml
|
||||||
when: not hubs_dev_mode
|
when: not hubs_dev_mode
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
- include: nginx.yml
|
- include_tasks: nginx.yml
|
||||||
|
|
||||||
- include: ssl-setup.yml
|
- include_tasks: ssl-setup.yml
|
||||||
when: not httpd_no_ssl
|
when: not httpd_no_ssl
|
||||||
|
|
|
@ -50,10 +50,10 @@
|
||||||
service: name=openqa-ppc64-prep enabled=yes state=started
|
service: name=openqa-ppc64-prep enabled=yes state=started
|
||||||
when: "ansible_architecture is defined and ansible_architecture == 'ppc64le'"
|
when: "ansible_architecture is defined and ansible_architecture == 'ppc64le'"
|
||||||
|
|
||||||
- include: nfs-client.yml
|
- include_tasks: nfs-client.yml
|
||||||
when: openqa_hostname is defined and openqa_hostname != "localhost"
|
when: openqa_hostname is defined and openqa_hostname != "localhost"
|
||||||
|
|
||||||
- include: tap-setup.yml
|
- include_tasks: tap-setup.yml
|
||||||
when: openqa_tap is defined and openqa_tap
|
when: openqa_tap is defined and openqa_tap
|
||||||
|
|
||||||
- name: openQA client config
|
- name: openQA client config
|
||||||
|
@ -66,7 +66,7 @@
|
||||||
tags:
|
tags:
|
||||||
- config
|
- config
|
||||||
|
|
||||||
- include: createhdds.yml
|
- include_tasks: createhdds.yml
|
||||||
when: "inventory_hostname in groups['openqa-hdds-workers']"
|
when: "inventory_hostname in groups['openqa-hdds-workers']"
|
||||||
|
|
||||||
- name: Enable and start worker services
|
- name: Enable and start worker services
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
---
|
---
|
||||||
- include: source_{{ atomic_reactor_source }}.yml
|
- include_tasks: source_{{ atomic_reactor_source }}.yml
|
||||||
|
|
|
@ -188,5 +188,5 @@
|
||||||
tags:
|
tags:
|
||||||
- oc
|
- oc
|
||||||
|
|
||||||
- include: orchestrator.yml
|
- include_tasks: orchestrator.yml
|
||||||
when: osbs_orchestrator
|
when: osbs_orchestrator
|
||||||
|
|
|
@ -134,8 +134,8 @@
|
||||||
tags:
|
tags:
|
||||||
- oc
|
- oc
|
||||||
|
|
||||||
- include: yum_proxy.yml
|
- include_tasks: yum_proxy.yml
|
||||||
when: osbs_yum_proxy_image is defined
|
when: osbs_yum_proxy_image is defined
|
||||||
|
|
||||||
- include: registry.yml
|
- include_tasks: registry.yml
|
||||||
when: osbs_docker_registry is defined and osbs_docker_registry
|
when: osbs_docker_registry is defined and osbs_docker_registry
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
- include: psql_setup.yml
|
- include_tasks: psql_setup.yml
|
||||||
|
|
||||||
# Need to set selinux to permissive for now due to https://bugzilla.redhat.com/show_bug.cgi?id=1291940
|
# Need to set selinux to permissive for now due to https://bugzilla.redhat.com/show_bug.cgi?id=1291940
|
||||||
- name: switch selinux to permissive
|
- name: switch selinux to permissive
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue