summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-02 11:23:40 -0800
committerGitHub <noreply@github.com>2018-02-02 11:23:40 -0800
commitb9e4318b7ac3d420cb78b8df6fae526df75d8328 (patch)
tree1d087e0350862af73d2289e80003048e48b28e93
parente999558b8994488f2a6f47a4057d2deea4be1a22 (diff)
parent72025672bcda5a608aeda30ec416c2c43922cb34 (diff)
downloadopenshift-b9e4318b7ac3d420cb78b8df6fae526df75d8328.tar.gz
openshift-b9e4318b7ac3d420cb78b8df6fae526df75d8328.tar.bz2
openshift-b9e4318b7ac3d420cb78b8df6fae526df75d8328.tar.xz
openshift-b9e4318b7ac3d420cb78b8df6fae526df75d8328.zip
Merge pull request #6995 from vrutkovs/f27-omit
Automatic merge from submit-queue. Don't use 'omit' for package module 'name' param is required and can't be skipped. 'when' is used instead Fixes #6968
-rw-r--r--playbooks/init/base_packages.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/playbooks/init/base_packages.yml b/playbooks/init/base_packages.yml
index 0a730a88a..81f4dd183 100644
--- a/playbooks/init/base_packages.yml
+++ b/playbooks/init/base_packages.yml
@@ -16,8 +16,9 @@
- iproute
- "{{ 'python3-dbus' if ansible_distribution == 'Fedora' else 'dbus-python' }}"
- "{{ 'python3-PyYAML' if ansible_distribution == 'Fedora' else 'PyYAML' }}"
- - "{{ 'python-ipaddress' if ansible_distribution != 'Fedora' else omit }}"
+ - "{{ 'python-ipaddress' if ansible_distribution != 'Fedora' else '' }}"
- yum-utils
+ when: item != ''
register: result
until: result is succeeded