summaryrefslogtreecommitdiffstats
path: root/playbooks/aws/openshift-cluster/config.yml
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-12-18 14:01:34 -0500
committerKenny Woodson <kwoodson@redhat.com>2016-01-04 11:00:20 -0500
commit67b3fff8257072095ebdebfdfe5c429efea3a8d8 (patch)
tree8a25b519e2171a7abd145ba19cf97b638cbcedb5 /playbooks/aws/openshift-cluster/config.yml
parenta21189c1f0611bff6935364c8c255a88060d882d (diff)
downloadopenshift-67b3fff8257072095ebdebfdfe5c429efea3a8d8.tar.gz
openshift-67b3fff8257072095ebdebfdfe5c429efea3a8d8.tar.bz2
openshift-67b3fff8257072095ebdebfdfe5c429efea3a8d8.tar.xz
openshift-67b3fff8257072095ebdebfdfe5c429efea3a8d8.zip
Cleanup and fixes for cluster_id change
- Move debug_level into vars.yml and byo inventory - change variables in cluster_hosts.yml to be g_* and update playbooks to use those values directly instead of setting them indirectly - added a new g_all_hosts entry in cluster_hosts to use in the update playbook instead of unioning all host types within the playbook - added a cluster_hosts.yml for the byo playbook
Diffstat (limited to 'playbooks/aws/openshift-cluster/config.yml')
-rw-r--r--playbooks/aws/openshift-cluster/config.yml31
1 files changed, 6 insertions, 25 deletions
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml
index 04d9ac6c8..abdb23d78 100644
--- a/playbooks/aws/openshift-cluster/config.yml
+++ b/playbooks/aws/openshift-cluster/config.yml
@@ -1,33 +1,14 @@
---
-- hosts: localhost
- gather_facts: no
- connection: local
- 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_files:
+ - ../../aws/openshift-cluster/vars.yml
+ - ../../aws/openshift-cluster/cluster_hosts.yml
vars:
- 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_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 }}"