diff --git a/roles/configure-mirrors/tasks/mirror.yaml b/roles/configure-mirrors/tasks/mirror.yaml index 34e2581c8..bea8b57e3 100644 --- a/roles/configure-mirrors/tasks/mirror.yaml +++ b/roles/configure-mirrors/tasks/mirror.yaml @@ -1,12 +1,3 @@ -- name: Install /etc/pip.conf configuration - become: yes - template: - dest: /etc/pip.conf - group: root - mode: 0644 - owner: root - src: etc/pip.conf.j2 - - name: Install .pydistutils.cfg configuration in homedir template: dest: ~/.pydistutils.cfg @@ -20,6 +11,15 @@ - "{{ ansible_os_family }}.yaml" - "default.yaml" +- name: Install /etc/pip.conf configuration + become: yes + template: + dest: /etc/pip.conf + group: root + mode: 0644 + owner: root + src: etc/pip.conf.j2 + - name: Setup distribution specific packaging mirrors include: "{{ item }}" static: no diff --git a/roles/configure-mirrors/vars/Suse.yaml b/roles/configure-mirrors/vars/Suse.yaml index db29c7444..5947d7121 100644 --- a/roles/configure-mirrors/vars/Suse.yaml +++ b/roles/configure-mirrors/vars/Suse.yaml @@ -1 +1,7 @@ package_mirror: "http://{{ mirror_fqdn }}/opensuse" +wheels_slug: "{%- if ansible_distribution == 'openSUSE Tumbleweed' -%} + opensuse-tumbleweed-{{ ansible_architecture | lower }} + {%- else -%} + {{ ansible_distribution | lower }}-{{ ansible_distribution_version }}-{{ ansible_architecture | lower }} + {%- endif -%}" +wheel_mirror: "http://{{ mirror_fqdn }}/wheel/{{ wheels_slug }}"