diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-28 14:38:33 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-29 09:52:01 -0400 |
| commit | cb0fc3000447b6305491fe24d28d4b8574e4acac (patch) | |
| tree | 30bf65f1cfb6dacb943b774be864d4cede0f0d4d /roles | |
| parent | d4da502b9f332a6e4ec5a3b757dd8bf352990ec8 (diff) | |
| download | openshift-cb0fc3000447b6305491fe24d28d4b8574e4acac.tar.gz openshift-cb0fc3000447b6305491fe24d28d4b8574e4acac.tar.bz2 openshift-cb0fc3000447b6305491fe24d28d4b8574e4acac.tar.xz openshift-cb0fc3000447b6305491fe24d28d4b8574e4acac.zip | |
Use openshift.master.ha instead of duplicating the logic
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/handlers/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/systemd_units.yml | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/roles/openshift_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml index e5b9e4977..70c7ef4e4 100644 --- a/roles/openshift_master/handlers/main.yml +++ b/roles/openshift_master/handlers/main.yml @@ -1,17 +1,17 @@ --- - name: restart master service: name={{ openshift.common.service_type }}-master state=restarted - when: (not openshift_master_ha | bool) and (not (master_service_status_changed | default(false) | bool)) + when: (openshift.master.ha is defined and not openshift.master.ha | bool) and (not (master_service_status_changed | default(false) | bool)) notify: Verify API Server - name: restart master api service: name={{ openshift.common.service_type }}-master-api state=restarted - when: (openshift_master_ha | bool) and (not (master_api_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native' + when: (openshift.master.ha is defined and openshift_master_ha | bool) and (not (master_api_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native' notify: Verify API Server - name: restart master controllers service: name={{ openshift.common.service_type }}-master-controllers state=restarted - when: (openshift_master_ha | bool) and (not (master_controllers_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native' + when: (openshift.master.ha is defined and openshift_master_ha | bool) and (not (master_controllers_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native' - name: Verify API Server # Using curl here since the uri module requires python-httplib2 and diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml index d4e5a60d2..1037890d1 100644 --- a/roles/openshift_master/tasks/systemd_units.yml +++ b/roles/openshift_master/tasks/systemd_units.yml @@ -18,7 +18,7 @@ template: src: "{{ ha_svc_template_path }}/atomic-openshift-master-{{ item }}.service.j2" dest: "{{ ha_svc_svc_dir }}/{{ openshift.common.service_type }}-master-{{ item }}.service" - when: openshift_master_ha | bool and openshift_master_cluster_method == "native" + when: openshift.master.ha is defined and openshift.master.ha | bool and openshift_master_cluster_method == "native" with_items: - api - controllers @@ -32,7 +32,7 @@ template: src: "{{ ha_svc_template_path }}/atomic-openshift-master-api.j2" dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-api - when: openshift_master_ha | bool and openshift_master_cluster_method == "native" + when: openshift.master.ha is defined and openshift.master.ha | bool and openshift_master_cluster_method == "native" notify: - restart master api @@ -40,7 +40,7 @@ template: src: "{{ ha_svc_template_path }}/atomic-openshift-master-controllers.j2" dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-controllers - when: openshift_master_ha | bool and openshift_master_cluster_method == "native" + when: openshift.master.ha is defined and openshift.master.ha | bool and openshift_master_cluster_method == "native" notify: - restart master controllers @@ -49,7 +49,7 @@ dest: "/etc/systemd/system/{{ openshift.common.service_type }}-master.service" src: docker/master.docker.service.j2 register: install_result - when: openshift.common.is_containerized | bool and not openshift_master_ha | bool + when: openshift.common.is_containerized | bool and openshift.master.ha is defined and not openshift.master.ha | bool - name: Create the master service env file template: |