diff --git a/inventory/group_vars/qadevel-stg b/inventory/group_vars/qadevel-stg index 2cc208190a..b5f0f95971 100644 --- a/inventory/group_vars/qadevel-stg +++ b/inventory/group_vars/qadevel-stg @@ -22,7 +22,7 @@ virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ me sshd_config: ssh/sshd_config.qadevel external_hostname: qadevel-stg.qa.fedoraproject.org -mariadb_host: db-qa01.qa.fedoraproject.org +mariadb_host: localhost mariadb_user: '{{ qadevel_stg_mariadb_user }}' mariadb_password: '{{ qadevel_stg_mariadb_password }}' phabricator_db_prefix: 'phabricatorstg' diff --git a/playbooks/groups/qadevel-stg.yml b/playbooks/groups/qadevel-stg.yml index cc1ce6d686..5503e98bb8 100644 --- a/playbooks/groups/qadevel-stg.yml +++ b/playbooks/groups/qadevel-stg.yml @@ -39,7 +39,6 @@ - { role: yum-cron, tags: ['yumcron'] } - { role: sudo, tags: ['sudo'] } - apache - - { role: phabricator, tags: ['phabricator'] } tasks: # this is how you include other task lists @@ -50,6 +49,24 @@ handlers: - include: "{{ handlers }}/restart_services.yml" +- name: configure phabricator + hosts: qadevel-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: + - { role: maraidb_server, tags: ['mariadb'] } + - { role: phabricator, tags: ['phabricator'] } + + handlers: + - include: "{{ handlers }}/restart_services.yml" + + #- name: configure taskotron-ci master # hosts: qadevel-stg # user: root diff --git a/roles/phabricator/templates/local.json.j2 b/roles/phabricator/templates/local.json.j2 index 942fbb984f..4bea8e0a9a 100644 --- a/roles/phabricator/templates/local.json.j2 +++ b/roles/phabricator/templates/local.json.j2 @@ -5,7 +5,6 @@ "mysql.host" : "{{ mariadb_host }}", "mysql.user" : "{{ mariadb_user }}", "mysql.pass" : "{{ mariadb_password }}", - "storage.default-namespace" : "{{ phabricator_db_prefix }}", "load-libraries" : [], "log.access.path" : "/var/log/phabricator/access.log", "log.ssh.path" : "/var/log/phabricator/ssh.log",