summaryrefslogtreecommitdiffstats
path: root/playbooks/byo/openshift-master
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-03 17:09:50 -0500
committerGitHub <noreply@github.com>2017-02-03 17:09:50 -0500
commitc8ddd41e0f1819cd9a23a0b5679b8d0360aec92a (patch)
tree182c37f192c8bec3f190fe57ff7d974c9d96ef8d /playbooks/byo/openshift-master
parent87b0f005ee280540ec7afbd39f1a6b99a4c60ea3 (diff)
parent917e871843192b107776ce8459b87f3960e455ed (diff)
downloadopenshift-c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a.tar.gz
openshift-c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a.tar.bz2
openshift-c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a.tar.xz
openshift-c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a.zip
Merge pull request #2671 from abutcher/cert-redeploy-restructure
Restructure certificate redeploy playbooks
Diffstat (limited to 'playbooks/byo/openshift-master')
-rw-r--r--playbooks/byo/openshift-master/restart.yml36
1 files changed, 3 insertions, 33 deletions
diff --git a/playbooks/byo/openshift-master/restart.yml b/playbooks/byo/openshift-master/restart.yml
index 3e58ccbcc..2d20f69f4 100644
--- a/playbooks/byo/openshift-master/restart.yml
+++ b/playbooks/byo/openshift-master/restart.yml
@@ -1,38 +1,8 @@
---
-- name: Create initial host groups for localhost
- hosts: localhost
- connection: local
- become: no
- gather_facts: no
+- include: ../../common/openshift-cluster/std_include.yml
tags:
- always
- tasks:
- - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml
- - name: Evaluate group l_oo_all_hosts
- add_host:
- name: "{{ item }}"
- groups: l_oo_all_hosts
- with_items: "{{ g_all_hosts | default([]) }}"
- changed_when: False
-- name: Create initial host groups for all hosts
- hosts: l_oo_all_hosts
- gather_facts: no
- tags:
- - always
- tasks:
- - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml
-
-- include: ../../common/openshift-cluster/evaluate_groups.yml
-- include: ../../common/openshift-master/validate_restart.yml
-
-- name: Restart masters
- hosts: oo_masters_to_config
+- include: ../../common/openshift-master/restart.yml
vars:
- openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}"
- serial: 1
- tasks:
- - include: restart_hosts.yml
- when: openshift.common.rolling_restart_mode == 'system'
- - include: restart_services.yml
- when: openshift.common.rolling_restart_mode == 'services'
+ openshift_deployment_type: "{{ deployment_type }}"