diff --git a/inventory/group_vars/qa-stg b/inventory/group_vars/qa-stg index e2f392e75e..7613c43d83 100644 --- a/inventory/group_vars/qa-stg +++ b/inventory/group_vars/qa-stg @@ -19,6 +19,9 @@ virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ me ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none" --network=bridge=br0,model=virtio --autostart --noautoconsole +# this enables infrastructure-testing repo +extra_enablerepos: 'infrastructure-testing' + sshd_config: ssh/sshd_config.qa-stg sshd_port: 222 external_hostname: qadevel-stg.cloud.fedoraproject.org diff --git a/inventory/group_vars/qadevel b/inventory/group_vars/qadevel index 41c03d0ef3..ffab867842 100644 --- a/inventory/group_vars/qadevel +++ b/inventory/group_vars/qadevel @@ -14,6 +14,8 @@ freezes: false tcp_ports: [ 80, 222, 443, "{{ buildslave_port }}", 222] +extra_enablerepos: '' + sshd_port: 222 sshd_config: ssh/sshd_config.qadevel diff --git a/roles/phabricator/tasks/main.yml b/roles/phabricator/tasks/main.yml index 6f5b40f6c5..6624edcbf8 100644 --- a/roles/phabricator/tasks/main.yml +++ b/roles/phabricator/tasks/main.yml @@ -1,5 +1,5 @@ -- name: ensure packages required for phabricator are installed (fedora) - action: yum name={{ item }} state=latest +- name: ensure packages required for phabricator are installed (yum) + yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }} with_items: - MySQL-python - git @@ -20,6 +20,31 @@ - libsemanage-python - libselinux-python - policycoreutils-python + when: ansible_distribution_major_version|int < 22 + +- name: ensure packages required for phabricator are installed (dnf) + dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }} + with_items: + - MySQL-python + - git + - httpd + - mod_ssl + - php + - php-cli + - php-mysql + - php-process + - php-devel + - php-gd + - php-mbstring + - php-opcache + - python-pygments + - libphutil + - arcanist + - phabricator + - libsemanage-python + - libselinux-python + - policycoreutils-python + when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined - name: create mariadb user for phabricator mysql_user: