diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2016-02-26 11:12:16 -0500 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-03-14 11:38:13 -0400 |
commit | 1565bc6e71bdda712d4cfdbf28754f00b38a4674 (patch) | |
tree | 8e5774e28e5ea233f09ffdcc446b6f692ab0cf2f /playbooks/byo/openshift-cluster | |
parent | a0e7f19f9f7f423d8fe001a247ccf2c98d815d68 (diff) | |
download | openshift-1565bc6e71bdda712d4cfdbf28754f00b38a4674.tar.gz openshift-1565bc6e71bdda712d4cfdbf28754f00b38a4674.tar.bz2 openshift-1565bc6e71bdda712d4cfdbf28754f00b38a4674.tar.xz openshift-1565bc6e71bdda712d4cfdbf28754f00b38a4674.zip |
Docker role refactor
- refactors the docker role to push generic config into docker role and wrap
openshift specific variables into an openshift_docker role and it's
dependent openshift_docker_facts role
- adds support for setting --confirm-def-push flag (Resolves
https://github.com/openshift/openshift-ansible/issues/1014)
- moves docker related facts from common/node roles to a new docker role
- renames cli_docker_* role varialbes to openshift_docker-* (maintaining
backward compatibility)
- update role dependencies to pull in openshift_docker conditionally based on
is_containerized
- remove playbooks/common/openshift-docker since the docker role is now
conditionally included
Diffstat (limited to 'playbooks/byo/openshift-cluster')
-rw-r--r-- | playbooks/byo/openshift-cluster/cluster_hosts.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/byo/openshift-cluster/cluster_hosts.yml b/playbooks/byo/openshift-cluster/cluster_hosts.yml index 8893db245..658204c17 100644 --- a/playbooks/byo/openshift-cluster/cluster_hosts.yml +++ b/playbooks/byo/openshift-cluster/cluster_hosts.yml @@ -14,4 +14,6 @@ g_new_node_hosts: "{{ groups.new_nodes | default([]) }}" g_nfs_hosts: "{{ groups.nfs | default([]) }}" g_all_hosts: "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts) - | union(g_lb_hosts) | default([]) }}" + | union(g_lb_hosts) | union(g_nfs_hosts) + | union(g_new_node_hosts)| union(g_new_master_hosts) + | default([]) }}" |