diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-01 14:59:07 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-01 14:59:07 -0400 |
commit | b2ccb858cb675d7a30179d1a60e638e9e311a4d5 (patch) | |
tree | e88de80e0c38c1a53f760953d8c418f9278c2a4a /roles/openshift_facts | |
parent | 2fdd7892232de00431601b817d428742e05efdf2 (diff) | |
parent | 6dde91d9347a650df355bb7fe1edb746ebae2817 (diff) | |
download | openshift-b2ccb858cb675d7a30179d1a60e638e9e311a4d5.tar.gz openshift-b2ccb858cb675d7a30179d1a60e638e9e311a4d5.tar.bz2 openshift-b2ccb858cb675d7a30179d1a60e638e9e311a4d5.tar.xz openshift-b2ccb858cb675d7a30179d1a60e638e9e311a4d5.zip |
Merge pull request #5260 from mgugino-upstream-stage/remove-clock-from-openshift-facts
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 251d1dfb4..cf78b4a75 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1909,7 +1909,6 @@ class OpenShiftFacts(object): """ known_roles = ['builddefaults', 'buildoverrides', - 'clock', 'cloudprovider', 'common', 'docker', @@ -2099,13 +2098,6 @@ class OpenShiftFacts(object): docker['service_name'] = 'docker' defaults['docker'] = docker - if 'clock' in roles: - exit_code, _, _ = module.run_command(['rpm', '-q', 'chrony']) # noqa: F405 - chrony_installed = bool(exit_code == 0) - defaults['clock'] = dict( - enabled=True, - chrony_installed=chrony_installed) - if 'cloudprovider' in roles: defaults['cloudprovider'] = dict(kind=None) |