summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2017-01-29 00:05:13 -0500
committerGitHub <noreply@github.com>2017-01-29 00:05:13 -0500
commite11ecff826aba160fee68c35f954eb86f92d670f (patch)
tree780d0428cbea6a0b8e903b776104cf88fe3d32b4 /playbooks/common
parent9231620fc6007b2c35f859929f67242954d0d77e (diff)
parentf606ccc1623a422878ab48b4451124453c7c6ded (diff)
downloadopenshift-e11ecff826aba160fee68c35f954eb86f92d670f.tar.gz
openshift-e11ecff826aba160fee68c35f954eb86f92d670f.tar.bz2
openshift-e11ecff826aba160fee68c35f954eb86f92d670f.tar.xz
openshift-e11ecff826aba160fee68c35f954eb86f92d670f.zip
Merge pull request #3215 from mtnbikenc/std-play-naming
Standardize entry-point playbooks with named plays
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/initialize_openshift_version.yml3
-rw-r--r--playbooks/common/openshift-cluster/update_repos_and_packages.yml3
-rw-r--r--playbooks/common/openshift-cluster/upgrades/init.yml8
3 files changed, 10 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
index a1bd1bd92..07b38920f 100644
--- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml
+++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
@@ -1,6 +1,7 @@
---
# NOTE: requires openshift_facts be run
-- hosts: l_oo_all_hosts
+- name: Verify compatible yum/subscription-manager combination
+ hosts: l_oo_all_hosts
gather_facts: no
tasks:
# See:
diff --git a/playbooks/common/openshift-cluster/update_repos_and_packages.yml b/playbooks/common/openshift-cluster/update_repos_and_packages.yml
index e3d16d359..b83e4d821 100644
--- a/playbooks/common/openshift-cluster/update_repos_and_packages.yml
+++ b/playbooks/common/openshift-cluster/update_repos_and_packages.yml
@@ -1,7 +1,8 @@
---
- include: evaluate_groups.yml
-- hosts: oo_hosts_to_update
+- name: Subscribe hosts, update repos and update OS packages
+ hosts: oo_hosts_to_update
vars:
openshift_deployment_type: "{{ deployment_type }}"
roles:
diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml
index 235853b0f..b62557550 100644
--- a/playbooks/common/openshift-cluster/upgrades/init.yml
+++ b/playbooks/common/openshift-cluster/upgrades/init.yml
@@ -1,9 +1,11 @@
---
-- name: Create l_oo_all_hosts group
+- name: Create initial host groups for localhost
hosts: localhost
connection: local
become: no
gather_facts: no
+ tags:
+ - always
tasks:
- include_vars: ../../../byo/openshift-cluster/cluster_hosts.yml
- name: Evaluate group l_oo_all_hosts
@@ -13,9 +15,11 @@
with_items: "{{ g_all_hosts | default([]) }}"
changed_when: False
-- name: Include g_*_hosts vars for hosts in group l_oo_all_hosts
+- 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