From 5d1b09d13900ae63193e4c5e3e6a6f4d28613b66 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Thu, 26 Nov 2015 01:34:16 +0000 Subject: [PATCH] fixing more package install dnf/yum logic --- playbooks/manual/update-packages.yml | 8 ++++---- roles/apache/tasks/main.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/playbooks/manual/update-packages.yml b/playbooks/manual/update-packages.yml index 0af790b5fc..0003b8dd66 100644 --- a/playbooks/manual/update-packages.yml +++ b/playbooks/manual/update-packages.yml @@ -25,17 +25,17 @@ - name: dnf clean all (since we can't do it when updating) command: dnf clean all - when: not testing and ansible_distribution_major_version|int > 22 + when: not testing and ansible_distribution_major_version|int > 21 - name: dnf update {{ package }} from main repo dnf: name="{{ package }}" state=latest - when: not testing and ansible_distribution_major_version|int > 22 + when: not testing and ansible_distribution_major_version|int > 21 - name: dnf clean all (since we can't do it when updating) command: dnf clean all --enablerepo=infrastructure-testing - when: testing and ansible_distribution_major_version|int > 22 + when: testing and ansible_distribution_major_version|int > 21 - name: dnf update {{ package }} from testing repo dnf: name="{{ package }}" state=latest enablerepo=infrastructure-testing - when: testing and ansible_distribution_major_version|int > 22 + when: testing and ansible_distribution_major_version|int > 21 diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml index 9dc55f0209..69b8d6994f 100644 --- a/roles/apache/tasks/main.yml +++ b/roles/apache/tasks/main.yml @@ -19,7 +19,7 @@ tags: - packages - apache - when: ansible_distribution_major_version|int > 22 + when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined - name: set apache running/enabled service: name=httpd enabled=yes