diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-03 15:34:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 15:34:32 -0700 |
| commit | 413fe019b488b75909629c68949ba693004afd6a (patch) | |
| tree | fbac3883785c47aedd655467222f0bc17041bc99 | |
| parent | 857ae368258799a747eb5f5868184cc6f71c8db4 (diff) | |
| parent | baa6713c9581261acacef9b8dcf6fad51cfdac65 (diff) | |
| download | openshift-413fe019b488b75909629c68949ba693004afd6a.tar.gz openshift-413fe019b488b75909629c68949ba693004afd6a.tar.bz2 openshift-413fe019b488b75909629c68949ba693004afd6a.tar.xz openshift-413fe019b488b75909629c68949ba693004afd6a.zip | |
Merge pull request #6005 from mgugino-upstream-stage/fix-master-version-detect
Automatic merge from submit-queue.
Fix master upgrade version detect and systemd enable
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1508755
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509158
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/systemd_units.yml | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 33028fea4..a88945538 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1289,7 +1289,7 @@ def get_container_openshift_version(facts): If containerized, see if we can determine the installed version via the systemd environment files. """ - for filename in ['/etc/sysconfig/%s-master', '/etc/sysconfig/%s-node']: + for filename in ['/etc/sysconfig/%s-master-controllers', '/etc/sysconfig/%s-node']: env_path = filename % facts['common']['service_type'] if not os.path.exists(env_path): continue diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml index 5751723ab..8420dfb8c 100644 --- a/roles/openshift_master/tasks/systemd_units.yml +++ b/roles/openshift_master/tasks/systemd_units.yml @@ -58,6 +58,17 @@ - l_create_ha_unit_files | changed # end workaround for missing systemd unit files +- name: enable master services + systemd: + name: "{{ openshift.common.service_type }}-master-{{ item }}" + enabled: yes + with_items: + - api + - controllers + when: + - openshift.master.cluster_method == "native" + - not openshift.common.is_master_system_container | bool + - name: Preserve Master API Proxy Config options command: grep PROXY /etc/sysconfig/{{ openshift.common.service_type }}-master-api register: l_master_api_proxy |