summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-07-07 12:28:28 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-07-07 12:28:28 -0300
commitc1728c8847177988e4532b9c9c777e1a23223410 (patch)
tree088f54441da3f49d6d4f9b4464072e19db886f2e
parent76829048f7b529f0932bb99d96a774244329291a (diff)
downloadopenshift-c1728c8847177988e4532b9c9c777e1a23223410.tar.gz
openshift-c1728c8847177988e4532b9c9c777e1a23223410.tar.bz2
openshift-c1728c8847177988e4532b9c9c777e1a23223410.tar.xz
openshift-c1728c8847177988e4532b9c9c777e1a23223410.zip
Move repoquery fact definition to openshift_common.
-rw-r--r--playbooks/common/openshift-cluster/initialize_facts.yml3
-rw-r--r--roles/openshift_common/tasks/main.yml5
2 files changed, 5 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_facts.yml b/playbooks/common/openshift-cluster/initialize_facts.yml
index d6759cb13..04dde632b 100644
--- a/playbooks/common/openshift-cluster/initialize_facts.yml
+++ b/playbooks/common/openshift-cluster/initialize_facts.yml
@@ -11,6 +11,3 @@
hostname: "{{ openshift_hostname | default(None) }}"
- set_fact:
openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}"
- - set_fact:
- repoquery_cmd: "{{ 'dnf repoquery --latest-limit 1 -d 0' if ansible_pkg_mgr == 'dnf' else 'repoquery --plugins' }}"
-
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index 77f3811c1..afddef125 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -45,3 +45,8 @@
command: >
hostnamectl set-hostname {{ openshift.common.hostname }}
when: openshift_set_hostname | default(set_hostname_default) | bool
+
+- name: Set repoquery command
+ set_fact:
+ repoquery_cmd: "{{ 'dnf repoquery --latest-limit 1 -d 0' if ansible_pkg_mgr == 'dnf' else 'repoquery --plugins' }}"
+