From 9fc1e7ac3e066add840be7691a9647f6157afe27 Mon Sep 17 00:00:00 2001 From: John T Skarbek Date: Thu, 3 Dec 2015 22:37:33 -0500 Subject: Make the install of openshift_examples optional * Allows us to make it optional to run the role `openshift_examples` * Defaults to true --- roles/openshift_common/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'roles/openshift_common') diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index c0982290d..07664b9ec 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -14,6 +14,7 @@ cluster_id: "{{ openshift_cluster_id | default('default') }}" debug_level: "{{ openshift_debug_level | default(2) }}" hostname: "{{ openshift_hostname | default(None) }}" + install_examples: "{{ openshift_install_examples | default(True) }}" ip: "{{ openshift_ip | default(None) }}" public_hostname: "{{ openshift_public_hostname | default(None) }}" public_ip: "{{ openshift_public_ip | default(None) }}" -- cgit v1.2.3 From cb9100073eefa4a810d934cc8fc73e0f1027a8f3 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Thu, 10 Dec 2015 10:38:49 -0500 Subject: Install base package in openshift_common for version facts --- roles/openshift_common/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'roles/openshift_common') diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index c0982290d..c17cb12cd 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -24,6 +24,12 @@ use_flannel: "{{ openshift_use_flannel | default(None) }}" use_manageiq: "{{ openshift_use_manageiq | default(None) }}" +- name: Install the base package for versioning + action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}{{ openshift_version | default('') }} state=present" + +- name: Set version facts + openshift_facts: + # For enterprise versions < 3.1 and origin versions < 1.1 we want to set the # hostname by default. - set_fact: -- cgit v1.2.3