diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-11-27 13:07:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 13:07:37 -0500 |
| commit | 96bc873739197ea6aeb2712d6d26f6e3fd29e0d5 (patch) | |
| tree | 765eb1dec5cb3de80e19768fc357c8c464008c4e /roles/openshift_master | |
| parent | 9dbcf7bfda85d33f2d0d9653ab5a3cab714b3514 (diff) | |
| parent | 94bbe2b08cec73b79d8c0755df45677229c35e34 (diff) | |
| download | openshift-96bc873739197ea6aeb2712d6d26f6e3fd29e0d5.tar.gz openshift-96bc873739197ea6aeb2712d6d26f6e3fd29e0d5.tar.bz2 openshift-96bc873739197ea6aeb2712d6d26f6e3fd29e0d5.tar.xz openshift-96bc873739197ea6aeb2712d6d26f6e3fd29e0d5.zip | |
Merge pull request #6199 from mgugino-upstream-stage/master_sys_container
Simplify is_master_system_container logic
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/systemd_units.yml | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index 99bc12514..e9a51e55b 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -13,6 +13,8 @@ system_images_registry_dict: system_images_registry: "{{ system_images_registry_dict[openshift_deployment_type | default('origin')] }}" +l_is_master_system_container: "{{ (openshift_use_master_system_container | default(openshift_use_system_containers | default(false)) | bool) }}" + openshift_node_ips: [] r_openshift_master_clean_install: false r_openshift_master_etcd3_storage: false diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index e2f92d597..d570a1c7f 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -180,7 +180,7 @@ include_tasks: system_container.yml when: - openshift.common.is_containerized | bool - - openshift.common.is_master_system_container | bool + - l_is_master_system_container | bool - name: Create session secrets file template: diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml index 582185198..9d11ed574 100644 --- a/roles/openshift_master/tasks/systemd_units.yml +++ b/roles/openshift_master/tasks/systemd_units.yml @@ -26,7 +26,7 @@ ignore_errors: true when: - openshift.master.cluster_method == "native" - - not openshift.common.is_master_system_container | bool + - not l_is_master_system_container | bool # This is the image used for both HA and non-HA clusters: - name: Pre-pull master image @@ -36,7 +36,7 @@ changed_when: "'Downloaded newer image' in l_pull_result.stdout" when: - openshift.common.is_containerized | bool - - not openshift.common.is_master_system_container | bool + - not l_is_master_system_container | bool - name: Create the ha systemd unit files template: @@ -44,7 +44,7 @@ dest: "{{ containerized_svc_dir }}/{{ openshift.common.service_type }}-master-{{ item }}.service" when: - openshift.master.cluster_method == "native" - - not openshift.common.is_master_system_container | bool + - not l_is_master_system_container | bool with_items: - api - controllers @@ -64,7 +64,7 @@ - controllers when: - openshift.master.cluster_method == "native" - - not openshift.common.is_master_system_container | bool + - not l_is_master_system_container | bool - name: Preserve Master API Proxy Config options command: grep PROXY /etc/sysconfig/{{ openshift.common.service_type }}-master-api |