Skip to content

Commit

Permalink
Update play names for consistency.
Browse files Browse the repository at this point in the history
  • Loading branch information
abutcher committed Sep 29, 2016
1 parent eff53a3 commit 20b29cb
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 10 deletions.
6 changes: 4 additions & 2 deletions playbooks/byo/openshift-cluster/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---
- include: ../../common/openshift-cluster/verify_ansible_version.yml

- hosts: localhost
- name: Create initial host groups for localhost
hosts: localhost
connection: local
become: no
gather_facts: no
Expand All @@ -14,7 +15,8 @@
groups: l_oo_all_hosts
with_items: "{{ g_all_hosts | default([]) }}"

- hosts: l_oo_all_hosts
- name: Create initial host groups for all hosts
hosts: l_oo_all_hosts
gather_facts: no
tags:
- always
Expand Down
2 changes: 1 addition & 1 deletion playbooks/common/openshift-cluster/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

- include: initialize_openshift_version.yml

- name: Set oo_options
- name: Set oo_option facts
hosts: oo_all_hosts
tags:
- always
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
- hosts: localhost
- name: Verify Ansible version is greater than or equal to 2.1.0.0
hosts: localhost
connection: local
become: no
gather_facts: no
Expand Down
4 changes: 2 additions & 2 deletions playbooks/common/openshift-master/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Set master facts
- name: Gather and set facts for master hosts
hosts: oo_masters_to_config
vars:
t_oo_option_master_debug_level: "{{ lookup('oo_option', 'openshift_master_debug_level') }}"
Expand Down Expand Up @@ -91,7 +91,7 @@
register: g_master_mktemp
changed_when: False

- name: Check for cached session secrets
- name: Determine if session secrets must be generated
hosts: oo_first_master
roles:
- role: openshift_facts
Expand Down
2 changes: 1 addition & 1 deletion playbooks/common/openshift-nfs/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Configure nfs hosts
- name: Configure nfs
hosts: oo_nfs_to_config
roles:
- role: openshift_facts
Expand Down
6 changes: 3 additions & 3 deletions playbooks/common/openshift-node/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
with_items: "{{ groups.oo_nodes_to_config | default([]) }}"
when: hostvars[item].openshift.common is defined and hostvars[item].openshift.common.is_containerized | bool and (item in groups.oo_nodes_to_config and item in groups.oo_masters_to_config)

- name: Configure node instances
- name: Configure containerized nodes
hosts: oo_containerized_master_nodes
serial: 1
vars:
Expand Down Expand Up @@ -85,7 +85,7 @@
when: openshift.node.use_openshift_sdn | bool
- role: openshift_node

- name: Configure node instances
- name: Configure nodes
hosts: oo_nodes_to_config:!oo_containerized_master_nodes
vars:
openshift_node_master_api_url: "{{ hostvars[groups.oo_first_master.0].openshift.master.api_url }}"
Expand Down Expand Up @@ -153,7 +153,7 @@
- file: name={{ mktemp.stdout }} state=absent
changed_when: False

- name: Set schedulability
- name: Set node schedulability
hosts: oo_first_master
vars:
openshift_nodes: "{{ groups.oo_nodes_to_config | default([]) }}"
Expand Down

0 comments on commit 20b29cb

Please sign in to comment.