diff options
author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-12-14 12:47:51 -0500 |
---|---|---|
committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-12-14 12:47:51 -0500 |
commit | 4dfe16e0e567a633cedd8ee56ffaed5110ca1629 (patch) | |
tree | aa67c9a14ae30cf02177e53ae3e8d1e9c878f1c8 /roles/openshift_common | |
parent | eeb164fae0e6721100c4fcc1717d92bb85b9652c (diff) | |
parent | 4322b19c0503a4f149ac5bca251beba14178948d (diff) | |
download | openshift-4dfe16e0e567a633cedd8ee56ffaed5110ca1629.tar.gz openshift-4dfe16e0e567a633cedd8ee56ffaed5110ca1629.tar.bz2 openshift-4dfe16e0e567a633cedd8ee56ffaed5110ca1629.tar.xz openshift-4dfe16e0e567a633cedd8ee56ffaed5110ca1629.zip |
Merge pull request #1059 from twiest/master
sync master -> prod branch
Diffstat (limited to 'roles/openshift_common')
-rw-r--r-- | roles/openshift_common/tasks/main.yml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index c0982290d..c34f42838 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) }}" @@ -24,6 +25,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: |