diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2015-11-23 11:53:27 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2016-01-04 09:58:39 -0500 |
| commit | a21189c1f0611bff6935364c8c255a88060d882d (patch) | |
| tree | a69d854a9a2ce78c6917583ff5877cf4199c8a1a /playbooks/aws/openshift-cluster/config.yml | |
| parent | f1951b2ca60536e81c9ff26a30b1cfbaf5ca12e9 (diff) | |
| download | openshift-a21189c1f0611bff6935364c8c255a88060d882d.tar.gz openshift-a21189c1f0611bff6935364c8c255a88060d882d.tar.bz2 openshift-a21189c1f0611bff6935364c8c255a88060d882d.tar.xz openshift-a21189c1f0611bff6935364c8c255a88060d882d.zip | |
Removing environment and env tags.
Diffstat (limited to 'playbooks/aws/openshift-cluster/config.yml')
| -rw-r--r-- | playbooks/aws/openshift-cluster/config.yml | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml index f46988432..04d9ac6c8 100644 --- a/playbooks/aws/openshift-cluster/config.yml +++ b/playbooks/aws/openshift-cluster/config.yml @@ -5,18 +5,24 @@ become: no vars_files: - vars.yml + - cluster_hosts.yml tasks: - set_fact: g_ssh_user_tmp: "{{ deployment_vars[deployment_type].ssh_user }}" g_sudo_tmp: "{{ deployment_vars[deployment_type].sudo }}" + g_etcd_hosts: "{{ etcd_hosts }}" + g_master_hosts: "{{ master_hosts }}" + g_node_hosts: "{{ node_hosts }}" + g_lb_hosts: "{{ lb_hosts }}" + g_nfs_hosts: "{{ nfs_hosts }}" - include: ../../common/openshift-cluster/config.yml vars: - g_etcd_hosts: "{{ (groups['tag_host-type_etcd']|default([])) | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}" - g_lb_hosts: "{{ (groups['tag_host-type_lb']|default([])) | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}" - g_master_hosts: "{{ (groups['tag_host-type_master']|default([])) | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}" - g_nfs_hosts: "{{ (groups['tag_host-type_nfs']|default([])) | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}" - g_node_hosts: "{{ (groups['tag_host-type_node']|default([])) | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}" + g_etcd_hosts: "{{ hostvars.localhost.g_etcd_hosts }}" + g_master_hosts: "{{ hostvars.localhost.g_master_hosts }}" + g_node_hosts: "{{ hostvars.localhost.g_node_hosts }}" + g_lb_hosts: "{{ hostvars.localhost.g_lb_hosts }}" + g_nfs_hosts: "{{ hostvars.localhost.g_nfs_hosts }}" g_ssh_user: "{{ hostvars.localhost.g_ssh_user_tmp }}" g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}" g_nodeonmaster: true |