From edde00af6a5b811468fe2a0e9bff45346103be92 Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Tue, 19 Dec 2017 15:36:57 -0500
Subject: Move validate_hosts to prerequisites.yml
Move more checks outside of init/main.yml for
speeding up upgrades and other operational plays that
need to run.
---
roles/container_runtime/defaults/main.yml | 2 --
1 file changed, 2 deletions(-)
(limited to 'roles/container_runtime')
diff --git a/roles/container_runtime/defaults/main.yml b/roles/container_runtime/defaults/main.yml
index 3e4b0c2b8..f4e249792 100644
--- a/roles/container_runtime/defaults/main.yml
+++ b/roles/container_runtime/defaults/main.yml
@@ -2,8 +2,6 @@
docker_cli_auth_config_path: '/root/.docker'
openshift_docker_signature_verification: False
-repoquery_cmd: "{{ 'dnf repoquery --latest-limit 1 -d 0' if ansible_pkg_mgr == 'dnf' else 'repoquery --plugins' }}"
-
openshift_docker_alternative_creds: False
# oreg_url is defined by user input.
--
cgit v1.2.3
From e3cf9edff6d0186b09b1a112592f283fab6857d0 Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Tue, 19 Dec 2017 16:36:47 -0500
Subject: Remove references to deployment_type
Move openshift_deployment_type check into sanity_check
action plugin. Remove compatibility for deployment_type.
deployment_type has been deprecated for some time now.
---
roles/container_runtime/meta/main.yml | 1 +
1 file changed, 1 insertion(+)
(limited to 'roles/container_runtime')
diff --git a/roles/container_runtime/meta/main.yml b/roles/container_runtime/meta/main.yml
index 5c4c569de..3bc2607fb 100644
--- a/roles/container_runtime/meta/main.yml
+++ b/roles/container_runtime/meta/main.yml
@@ -12,3 +12,4 @@ galaxy_info:
dependencies:
- role: lib_openshift
- role: lib_utils
+- role: openshift_facts
--
cgit v1.2.3