diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-11-27 15:39:46 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-12-07 14:37:36 -0500 |
| commit | eb6b20fc9183cc2aae424c72efd1191b99110a93 (patch) | |
| tree | ae3dec3c4b4581471f3de0afd8a1711235242cc6 /playbooks/openshift-master | |
| parent | 37ffebc86cd4fe89373542285b40d92f61696270 (diff) | |
| download | openshift-eb6b20fc9183cc2aae424c72efd1191b99110a93.tar.gz openshift-eb6b20fc9183cc2aae424c72efd1191b99110a93.tar.bz2 openshift-eb6b20fc9183cc2aae424c72efd1191b99110a93.tar.xz openshift-eb6b20fc9183cc2aae424c72efd1191b99110a93.zip | |
Remove openshift.common.service_type
This commit removes openshift.common.service_type
in favor of openshift_service_type.
This commit also removes r_openshift_excluder_service_type
from plays in favor of using the role's defaults.
Diffstat (limited to 'playbooks/openshift-master')
| -rw-r--r-- | playbooks/openshift-master/private/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/openshift-master/private/scaleup.yml | 4 | ||||
| -rw-r--r-- | playbooks/openshift-master/private/tasks/wire_aggregator.yml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/playbooks/openshift-master/private/config.yml b/playbooks/openshift-master/private/config.yml index afb8d6bd1..61fd54caa 100644 --- a/playbooks/openshift-master/private/config.yml +++ b/playbooks/openshift-master/private/config.yml @@ -19,7 +19,6 @@ roles: - role: openshift_excluder r_openshift_excluder_action: disable - r_openshift_excluder_service_type: "{{ openshift.common.service_type }}" - name: Gather and set facts for master hosts hosts: oo_masters_to_config @@ -228,6 +227,8 @@ - name: Configure API Aggregation on masters hosts: oo_masters serial: 1 + roles: + - role: openshift_facts tasks: - include_tasks: tasks/wire_aggregator.yml @@ -237,7 +238,6 @@ roles: - role: openshift_excluder r_openshift_excluder_action: enable - r_openshift_excluder_service_type: "{{ openshift.common.service_type }}" - name: Master Install Checkpoint End hosts: all diff --git a/playbooks/openshift-master/private/scaleup.yml b/playbooks/openshift-master/private/scaleup.yml index 8229eccfa..007b23ea3 100644 --- a/playbooks/openshift-master/private/scaleup.yml +++ b/playbooks/openshift-master/private/scaleup.yml @@ -20,11 +20,11 @@ - restart master controllers handlers: - name: restart master api - service: name={{ openshift.common.service_type }}-master-controllers state=restarted + service: name={{ openshift_service_type }}-master-controllers state=restarted notify: verify api server # We retry the controllers because the API may not be 100% initialized yet. - name: restart master controllers - command: "systemctl restart {{ openshift.common.service_type }}-master-controllers" + command: "systemctl restart {{ openshift_service_type }}-master-controllers" retries: 3 delay: 5 register: result diff --git a/playbooks/openshift-master/private/tasks/wire_aggregator.yml b/playbooks/openshift-master/private/tasks/wire_aggregator.yml index ecf8f15d9..4f55d5c82 100644 --- a/playbooks/openshift-master/private/tasks/wire_aggregator.yml +++ b/playbooks/openshift-master/private/tasks/wire_aggregator.yml @@ -180,13 +180,13 @@ #restart master serially here - name: restart master api - systemd: name={{ openshift.common.service_type }}-master-api state=restarted + systemd: name={{ openshift_service_type }}-master-api state=restarted when: - yedit_output.changed # We retry the controllers because the API may not be 100% initialized yet. - name: restart master controllers - command: "systemctl restart {{ openshift.common.service_type }}-master-controllers" + command: "systemctl restart {{ openshift_service_type }}-master-controllers" retries: 3 delay: 5 register: result |