summaryrefslogtreecommitdiffstats
path: root/playbooks/byo
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-01-05 11:39:22 -0500
committerAndrew Butcher <abutcher@redhat.com>2016-01-11 16:04:36 -0500
commitf9aaa8ac13adf841823f35be594641bdc2ebecac (patch)
treed60ccafbd99d54beb901766329e6f670aedaaff7 /playbooks/byo
parentdea9abfe22864cf10d85d85370b1633ca18060b6 (diff)
downloadopenshift-f9aaa8ac13adf841823f35be594641bdc2ebecac.tar.gz
openshift-f9aaa8ac13adf841823f35be594641bdc2ebecac.tar.bz2
openshift-f9aaa8ac13adf841823f35be594641bdc2ebecac.tar.xz
openshift-f9aaa8ac13adf841823f35be594641bdc2ebecac.zip
Update rolling restart playbook for pacemaker support.
Replace fail with a warn and prompt if running ansible from a host that will be rebooted. Re-organize playbooks.
Diffstat (limited to 'playbooks/byo')
-rw-r--r--playbooks/byo/openshift-cluster/restart.yml7
l---------playbooks/byo/openshift-master/filter_plugins1
l---------playbooks/byo/openshift-master/lookup_plugins1
-rw-r--r--playbooks/byo/openshift-master/restart.yml4
l---------playbooks/byo/openshift-master/roles1
5 files changed, 7 insertions, 7 deletions
diff --git a/playbooks/byo/openshift-cluster/restart.yml b/playbooks/byo/openshift-cluster/restart.yml
deleted file mode 100644
index da0da69a6..000000000
--- a/playbooks/byo/openshift-cluster/restart.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- include: ../../common/openshift-cluster/restart.yml
- vars:
- g_etcd_hosts: "{{ groups.etcd | default([]) }}"
- g_master_hosts: "{{ groups.masters | default([]) }}"
- g_node_hosts: "{{ groups.nodes | default([]) }}"
- g_lb_hosts: "{{ groups.lb | default([]) }}"
diff --git a/playbooks/byo/openshift-master/filter_plugins b/playbooks/byo/openshift-master/filter_plugins
new file mode 120000
index 000000000..99a95e4ca
--- /dev/null
+++ b/playbooks/byo/openshift-master/filter_plugins
@@ -0,0 +1 @@
+../../../filter_plugins \ No newline at end of file
diff --git a/playbooks/byo/openshift-master/lookup_plugins b/playbooks/byo/openshift-master/lookup_plugins
new file mode 120000
index 000000000..ac79701db
--- /dev/null
+++ b/playbooks/byo/openshift-master/lookup_plugins
@@ -0,0 +1 @@
+../../../lookup_plugins \ No newline at end of file
diff --git a/playbooks/byo/openshift-master/restart.yml b/playbooks/byo/openshift-master/restart.yml
new file mode 100644
index 000000000..a78a6aa3d
--- /dev/null
+++ b/playbooks/byo/openshift-master/restart.yml
@@ -0,0 +1,4 @@
+---
+- include: ../../common/openshift-master/restart.yml
+ vars_files:
+ - ../../byo/openshift-cluster/cluster_hosts.yml
diff --git a/playbooks/byo/openshift-master/roles b/playbooks/byo/openshift-master/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/byo/openshift-master/roles
@@ -0,0 +1 @@
+../../../roles \ No newline at end of file