diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2016-01-04 11:44:50 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2016-01-04 11:44:50 -0500 |
| commit | 1a5319841b028d94294f683e407963742f340fe5 (patch) | |
| tree | 08aa6aa833a3bf04cab1645b790bee1bc27ef6f3 /playbooks/aws/openshift-cluster/config.yml | |
| parent | 265cd64555c9262f0896505caa6b036f6092dd0d (diff) | |
| parent | da8165469a43dc3bf43b2024a76edcd04be0bb81 (diff) | |
| download | openshift-1a5319841b028d94294f683e407963742f340fe5.tar.gz openshift-1a5319841b028d94294f683e407963742f340fe5.tar.bz2 openshift-1a5319841b028d94294f683e407963742f340fe5.tar.xz openshift-1a5319841b028d94294f683e407963742f340fe5.zip | |
Merge pull request #958 from kwoodson/envfix
Fixing meta data tags env and environment
Diffstat (limited to 'playbooks/aws/openshift-cluster/config.yml')
| -rw-r--r-- | playbooks/aws/openshift-cluster/config.yml | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml index f46988432..abdb23d78 100644 --- a/playbooks/aws/openshift-cluster/config.yml +++ b/playbooks/aws/openshift-cluster/config.yml @@ -1,27 +1,14 @@ --- -- hosts: localhost - gather_facts: no - connection: local - become: no - vars_files: - - vars.yml - tasks: - - set_fact: - g_ssh_user_tmp: "{{ deployment_vars[deployment_type].ssh_user }}" - g_sudo_tmp: "{{ deployment_vars[deployment_type].sudo }}" - - include: ../../common/openshift-cluster/config.yml + vars_files: + - ../../aws/openshift-cluster/vars.yml + - ../../aws/openshift-cluster/cluster_hosts.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_ssh_user: "{{ hostvars.localhost.g_ssh_user_tmp }}" - g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}" + g_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" + g_sudo: "{{ deployment_vars[deployment_type].sudo }}" g_nodeonmaster: true openshift_cluster_id: "{{ cluster_id }}" - openshift_debug_level: 2 + openshift_debug_level: "{{ debug_level }}" openshift_deployment_type: "{{ deployment_type }}" openshift_hostname: "{{ ec2_private_ip_address }}" openshift_public_hostname: "{{ ec2_ip_address }}" |