diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-04-24 14:06:02 -0400 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-04-24 14:06:02 -0400 |
| commit | 196d37e2ffa0d7f4221a857b143fd09f84a9d00b (patch) | |
| tree | 4c5413c72a2dd2ec732730b6994a104cca6a9798 /playbooks/aws/openshift-master/config.yml | |
| parent | 7f7b582a7bc239e69c147b98c8c2512050f12851 (diff) | |
| parent | 8ce5e1de898d2fd2c4aa4620f31b57b62ed0c5d6 (diff) | |
| download | openshift-196d37e2ffa0d7f4221a857b143fd09f84a9d00b.tar.gz openshift-196d37e2ffa0d7f4221a857b143fd09f84a9d00b.tar.bz2 openshift-196d37e2ffa0d7f4221a857b143fd09f84a9d00b.tar.xz openshift-196d37e2ffa0d7f4221a857b143fd09f84a9d00b.zip | |
Merge pull request #187 from openshift/master
Merge master into INT
Diffstat (limited to 'playbooks/aws/openshift-master/config.yml')
| -rw-r--r-- | playbooks/aws/openshift-master/config.yml | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/playbooks/aws/openshift-master/config.yml b/playbooks/aws/openshift-master/config.yml index 1c4060eee..37ab4fbe6 100644 --- a/playbooks/aws/openshift-master/config.yml +++ b/playbooks/aws/openshift-master/config.yml @@ -1,24 +1,19 @@ --- -- name: Populate oo_masters_to_config host group if needed +- name: Populate oo_masters_to_config host group hosts: localhost gather_facts: no tasks: - - name: "Evaluate oo_host_group_exp if it's set" - add_host: "name={{ item }} groups=oo_masters_to_config" - with_items: "{{ oo_host_group_exp | default('') }}" - when: oo_host_group_exp is defined + - name: Evaluate oo_masters_to_config + add_host: + name: "{{ item }}" + groups: oo_masters_to_config + ansible_ssh_user: root + with_items: oo_host_group_exp | default([]) -- name: Configure instances - hosts: oo_masters_to_config +- include: ../../common/openshift-master/config.yml vars: + openshift_cluster_id: "{{ cluster_id }}" + openshift_debug_level: 4 + openshift_deployment_type: "{{ deployment_type }}" openshift_hostname: "{{ ec2_private_ip_address }}" openshift_public_hostname: "{{ ec2_ip_address }}" - # TODO: this should be removed once openshift-sdn packages are available - openshift_use_openshift_sdn: False - vars_files: - - vars.yml - roles: - - openshift_master - #- openshift_sdn_master - - pods - - os_env_extras |