diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 11:47:50 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 11:47:50 -0300 |
| commit | 88839ab89210ecd3d20d1f10f8f03bf0a801502a (patch) | |
| tree | f0816491f80f7ac5839259323785782e222f66a3 /playbooks/common | |
| parent | 81cb935e1817df4c633397680e963d635ed42e26 (diff) | |
| download | openshift-88839ab89210ecd3d20d1f10f8f03bf0a801502a.tar.gz openshift-88839ab89210ecd3d20d1f10f8f03bf0a801502a.tar.bz2 openshift-88839ab89210ecd3d20d1f10f8f03bf0a801502a.tar.xz openshift-88839ab89210ecd3d20d1f10f8f03bf0a801502a.zip | |
Do not install rpm for version in openshift_version role.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_openshift_version.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml index 75452f41d..88ec7840b 100644 --- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml +++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml @@ -3,14 +3,10 @@ - name: Determine openshift_version to configure on first master hosts: oo_first_master roles: - # Using the CLI role here to install the CLI tool/wrapper, and set the - # openshift.common.version fact which other hosts can then reference. - openshift_version pre_tasks: - - debug: var=openshift.common.version - debug: var=openshift_version post_tasks: - - debug: var=openshift.common.version - debug: var=openshift_version # NOTE: We set this even on etcd hosts as they may also later run as masters, diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 8ed62a7f1..7ab046e04 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -317,7 +317,7 @@ vars: sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" - # Do not pass a version if this is first master. (openshift_docker will sort it out) + # Do not pass a version if this is first master. (openshift_version will sort it out) # For subsequent masters we pass either pre-existing version for the master (if already installed), # otherwise the first master version. openshift_version: "{{ openshift.common.version if openshift.common.version is defined else oo_first_master.openshift.common.version.split('-')[0] }}" |