diff options
| -rw-r--r-- | inventory/group_vars/qa-prod | 100 | ||||
| -rw-r--r-- | inventory/host_vars/qa-prod01.qa.fedoraproject.org | 26 | ||||
| -rw-r--r-- | inventory/inventory | 3 | ||||
| -rw-r--r-- | playbooks/groups/qa.yml (renamed from playbooks/groups/qa-stg.yml) | 4 | ||||
| -rw-r--r-- | roles/base/files/ssh/sshd_config.qa-prod (renamed from roles/base/files/ssh/sshd_config.qadevel) | 0 | ||||
| -rw-r--r-- | roles/mariadb_server/files/my.cnf.phabricator | 2 | ||||
| -rw-r--r-- | roles/mariadb_server/files/my.cnf.qa-stg01.qa.fedoraproject.org | 6 |
7 files changed, 138 insertions, 3 deletions
diff --git a/inventory/group_vars/qa-prod b/inventory/group_vars/qa-prod new file mode 100644 index 000000000..34844eede --- /dev/null +++ b/inventory/group_vars/qa-prod @@ -0,0 +1,100 @@ +--- +# Define resources for this group of hosts here. +lvm_size: 40000 +mem_size: 8196 +num_cpus: 2 + +# for systems that do not match the above - specify the same parameter in +# the host_vars/$hostname file + +fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice,sysadmin-noc,sysadmin-veteran + + +freezes: true +sslonly: false + +sshd_config: ssh/sshd_config.qa-prod +sshd_port: 222 +external_hostname: qa.stg.fedoraproject.org + +# not needed with new setup +#sslcertfile: qa-stg.qa.fedoraproject.org.cert +#sslkeyfile: qa-stg.qa.fedoraproject.org.key +sslcertfile: '' +sslkeyfile: '' +sslintermediatecertfile: '' + + +################################################################################ +# Buildbot Settings +################################################################################ +# +buildmaster_db_host: localhost +buildmaster_template: ci.master.cfg.j2 +buildmaster_endpoint: buildmaster +buildslave_ssh_pubkey: '' +buildslave_port: 9989 +buildmaster_dir: /home/buildmaster/master +buildslave_dir: /home/buildslave/slave +buildslave_poll_interval: 1800 +buildmaster_home: /home/buildmaster +buildmaster_user: buildmaster +external_hostname: qa.fedoraproject.org + +# build details +repo_base: 'https://git.qa-prod01.qa.fedoraproject.org/diffusion' +docs_build_dir: /var/www/docs/ + +# for now, we're just doing a local slave so we need the slave vars in here +slave_home: /home/buildslave/ +slave_dir: /home/buildslave/slave +slave_user: buildslave +buildslave_name: 'qa-prod01-1' +buildslave_password: '{{ qa_prod_buildslave_password }}' + + +################################################################################ +# MariaDB Settings +################################################################################ + +mariadb_host: localhost +mariadb_config: my.cnf.phabricator +mariadb_user: '{{ qa_prod_mariadb_user }}' +mariadb_password: '{{ qa_prod_mariadb_password }}' + +################################################################################ +# Phabricator Settings +################################################################################ +phabricator_db_prefix: 'phabricator' +enable_phabricator_git: False +phabricator_vcs_user: git +phabricator_vcs_user_password: '{{ qa_prod_vcs_user_password }}' +phabricator_daemon_user: phabdaemon +phabroot: /usr/share/ +phabricator_filedir: /var/lib/phabricator/files +phabricator_repodir: /var/lib/phabricator/repos +phabricator_config_filename: qaconfig +phabricator_header_color: 'blue' +phabricator_mail_enabled: True +phabricator_mail_domain: fedoraproject.org +phabricator_mysqldump_filename: 'qa-prod_phabricator.sql' +ircnick: fedoraqabot + + +################################################################################ +# Backup Settings +################################################################################ + +backup_dir: /srv/backup +backup_username: root +backup_ssh_pubkey: ssh-dss AAAAB3NzaC1kc3MAAACBAJr3xqn/hHIXeth+NuXPu9P91FG9jozF3Q1JaGmg6szo770rrmhiSsxso/Ibm2mObqQLCyfm/qSOQRynv6tL3tQVHA6EEx0PNacnBcOV7UowR5kd4AYv82K1vQhof3YTxOMmNIOrdy6deDqIf4sLz1TDHvEDwjrxtFf8ugyZWNbTAAAAFQCS5puRZF4gpNbaWxe6gLzm3rBeewAAAIBcEd6pRatE2Qc/dW0YwwudTEaOCUnHmtYs2PHKbOPds0+Woe1aWH38NiE+CmklcUpyRsGEf3O0l5vm3VrVlnfuHpgt/a/pbzxm0U6DGm2AebtqEmaCX3CIuYzKhG5wmXqJ/z+Hc5MDj2mn2TchHqsk1O8VZM+1Ml6zX3Hl4vvBsQAAAIALDt5NFv6GLuid8eik/nn8NORd9FJPDBJxgVqHNIm08RMC6aI++fqwkBhVPFKBra5utrMKQmnKs/sOWycLYTqqcSMPdWSkdWYjBCSJ/QNpyN4laCmPWLgb3I+2zORgR0EjeV2e/46geS0MWLmeEsFwztpSj4Tv4e18L8Dsp2uB2Q== root@backup03-rdiff-backup +host_backup_targets: ['/var/lib/phabricator/files', '/var/lib/phabricator/repos', '/srv/backup'] + + +################################################################################ +# Static Site Settings +################################################################################ + +static_sites: + - name: "{{ inventory_hostname }}" + document_root: /srv/content diff --git a/inventory/host_vars/qa-prod01.qa.fedoraproject.org b/inventory/host_vars/qa-prod01.qa.fedoraproject.org new file mode 100644 index 000000000..e322cfab5 --- /dev/null +++ b/inventory/host_vars/qa-prod01.qa.fedoraproject.org @@ -0,0 +1,26 @@ +--- +nm: 255.255.255.0 +gw: 10.5.124.254 +dns: 10.5.126.21 + +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24 +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/ +volgroup: /dev/VirtGuests + +eth0_ip: 10.5.124.231 +eth0_nm: 255.255.255.128 +vmhost: virthost-comm03.qa.fedoraproject.org +datacenter: phx2 +fas_client_groups: sysadmin-qa,sysadmin-main + +mariadb_root_password: "{{ qadevel_mariadb_root_password }}" + +public_hostname: qa.fedoraproject.org +short_hostname: qa-prod01.qa +buildmaster: 127.0.0.1 + +buildslaves: + - qa-prod01-1 + +slaves: + - { user: "{{ short_hostname }}-1", home: "/home/{{ short_hostname }}-1", dir: "/home/{{ short_hostname }}-1/slave" } diff --git a/inventory/inventory b/inventory/inventory index b6dccc82d..c86f64e1e 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -18,6 +18,9 @@ qa04.qa.fedoraproject.org [qadevel] qadevel.qa.fedoraproject.org:222 +[qa] +qa-prod01.qa.fedoraproject.org:222 + [qa-stg] qa-stg01.qa.fedoraproject.org:222 diff --git a/playbooks/groups/qa-stg.yml b/playbooks/groups/qa.yml index a59309772..28f3b6d28 100644 --- a/playbooks/groups/qa-stg.yml +++ b/playbooks/groups/qa.yml @@ -6,7 +6,7 @@ - include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=qa-stg" - name: make the box be real - hosts: qa-stg + hosts: qa:qa-stg user: root gather_facts: True @@ -37,7 +37,7 @@ - include: "{{ handlers }}/restart_services.yml" - name: configure phabricator - hosts: qa-stg + hosts: qa:qa-stg user: root gather_facts: True diff --git a/roles/base/files/ssh/sshd_config.qadevel b/roles/base/files/ssh/sshd_config.qa-prod index 1607a0b83..1607a0b83 100644 --- a/roles/base/files/ssh/sshd_config.qadevel +++ b/roles/base/files/ssh/sshd_config.qa-prod diff --git a/roles/mariadb_server/files/my.cnf.phabricator b/roles/mariadb_server/files/my.cnf.phabricator index 075d8ec7a..eb6229fbc 100644 --- a/roles/mariadb_server/files/my.cnf.phabricator +++ b/roles/mariadb_server/files/my.cnf.phabricator @@ -128,7 +128,7 @@ innodb_log_group_home_dir = /var/lib/mysql innodb_buffer_pool_size = 1600M innodb_additional_mem_pool_size = 200M # Set .._log_file_size to 25 % of buffer pool size -innodb_log_file_size = 400M +innodb_log_file_size = 512M innodb_log_buffer_size = 800M innodb_flush_log_at_trx_commit = 1 innodb_lock_wait_timeout = 50 diff --git a/roles/mariadb_server/files/my.cnf.qa-stg01.qa.fedoraproject.org b/roles/mariadb_server/files/my.cnf.qa-stg01.qa.fedoraproject.org index 3a677d07b..0334f94ff 100644 --- a/roles/mariadb_server/files/my.cnf.qa-stg01.qa.fedoraproject.org +++ b/roles/mariadb_server/files/my.cnf.qa-stg01.qa.fedoraproject.org @@ -139,6 +139,12 @@ innodb_log_buffer_size = 768M innodb_flush_log_at_trx_commit = 1 innodb_lock_wait_timeout = 50 +# added as per reccommended by phab setup +ft_stopword_file=/usr/share/phabricator/resources/sql/stopwords.txt +ft_min_word_len=3 +ft_boolean_syntax=' |-><()~*:""&^' + + [mysqldump] quick max_allowed_packet = 16M |