From 1340787ce32627f0615d403551c135940e89beec Mon Sep 17 00:00:00 2001 From: s3lph Date: Fri, 13 Nov 2020 12:03:34 +0100 Subject: [PATCH] Fix package architecture --- roles/prometheus_node/tasks/debian10.yml | 11 +++++++---- roles/prometheus_node/tasks/ucs.yml | 12 ++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/roles/prometheus_node/tasks/debian10.yml b/roles/prometheus_node/tasks/debian10.yml index a5a82a0..e02f3c7 100644 --- a/roles/prometheus_node/tasks/debian10.yml +++ b/roles/prometheus_node/tasks/debian10.yml @@ -3,28 +3,31 @@ - name: check if package files already exist stat: - path: "/root/{{ item.name }}_{{ item.version }}_amd64.deb" + path: "/root/{{ item.name }}_{{ item.version }}_{{ item.arch }}.deb" loop: - name: prometheus-node-exporter version: 1.0.1+ds-1 + arch: amd64 - name: prometheus-node-exporter-collectors version: 0+git20201003.8db38d1 + arch: all register: prometheus_node_register_ucs_deb_stat - name: download packages get_url: - url: "https://{{ debian_mirror }}/debian/pool/main/{{ pfirst | urlencode() }}/{{ package | urlencode() }}/{{ package | urlencode() }}_{{ version | urlencode() }}_amd64.deb" # noqa 204 - dest: "/root/{{ package }}_{{ version }}_amd64.deb" + url: "https://{{ debian_mirror }}/debian/pool/main/{{ pfirst | urlencode() }}/{{ package | urlencode() }}/{{ package | urlencode() }}_{{ version | urlencode() }}_{{ arch | urlencode() }}.deb" # noqa 204 + dest: "/root/{{ package }}_{{ version }}_{{ arch }}.deb" vars: pfirst: "{{ item.item.name[:1] }}" package: "{{ item.item.name }}" version: "{{ item.item.version }}" + arch: "{{ item.item.arch }}" when: not item.stat.exists loop: "{{ prometheus_node_register_ucs_deb_stat.results }}" - name: install packages apt: - deb: "/root/{{ item.item.name }}_{{ item.item.version }}_amd64.deb" + deb: "/root/{{ item.item.name }}_{{ item.item.version }}_{{ item.item.arch }}.deb" loop: "{{ prometheus_node_register_ucs_deb_stat.results }}" - name: start prometheus-node-exporter.service diff --git a/roles/prometheus_node/tasks/ucs.yml b/roles/prometheus_node/tasks/ucs.yml index ea93c28..fc4f0be 100644 --- a/roles/prometheus_node/tasks/ucs.yml +++ b/roles/prometheus_node/tasks/ucs.yml @@ -2,30 +2,34 @@ - name: check if package files already exist stat: - path: "/root/{{ item.name }}_{{ item.version }}_amd64.deb" + path: "/root/{{ item.name }}_{{ item.version }}_{{ item.arch }}.deb" loop: - name: prometheus-node-exporter version: 1.0.1+ds-1 + arch: amd64 - name: prometheus-node-exporter-collectors version: 0+git20201003.8db38d1 + arch: all - name: moreutils version: 0.64-1 + arch: amd64 register: prometheus_node_register_ucs_deb_stat - name: download packages get_url: - url: "https://{{ debian_mirror }}/debian/pool/main/{{ pfirst | urlencode() }}/{{ package | urlencode() }}/{{ package | urlencode() }}_{{ version | urlencode() }}_amd64.deb" # noqa 204 - dest: "/root/{{ package }}_{{ version }}_amd64.deb" + url: "https://{{ debian_mirror }}/debian/pool/main/{{ pfirst | urlencode() }}/{{ package | urlencode() }}/{{ package | urlencode() }}_{{ version | urlencode() }}_{{ arch | urlencode() }}.deb" # noqa 204 + dest: "/root/{{ package }}_{{ version }}_{{ arch }}.deb" vars: pfirst: "{{ item.item.name[:1] }}" package: "{{ item.item.name }}" version: "{{ item.item.version }}" + arch: "{{ item.item.arch }}" when: not item.stat.exists loop: "{{ prometheus_node_register_ucs_deb_stat.results }}" - name: install packages apt: - deb: "/root/{{ item.item.name }}_{{ item.item.version }}_amd64.deb" + deb: "/root/{{ item.item.name }}_{{ item.item.version }}_{{ item.item.arch }}.deb" loop: "{{ prometheus_node_register_ucs_deb_stat.results }}" - name: start prometheus-node-exporter.service