diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-10 12:10:29 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-10 12:10:29 -0400 |
| commit | fc2dd1cd305077ab9b6ee20fffb1bfe472c25985 (patch) | |
| tree | 84b4788df88bf61e6c18c9cbb4f3cef12ebb4991 | |
| parent | abe9dcfcdd29bb20c73a1d3735eb1d136b602ce4 (diff) | |
| parent | b6300dd7139ef37a039831bab6064179e3398d88 (diff) | |
| download | openshift-fc2dd1cd305077ab9b6ee20fffb1bfe472c25985.tar.gz openshift-fc2dd1cd305077ab9b6ee20fffb1bfe472c25985.tar.bz2 openshift-fc2dd1cd305077ab9b6ee20fffb1bfe472c25985.tar.xz openshift-fc2dd1cd305077ab9b6ee20fffb1bfe472c25985.zip | |
Merge pull request #70 from lhuard1A/fix_aws
Fix AWS playbooks
| -rw-r--r-- | playbooks/aws/openshift-master/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/aws/openshift-node/config.yml | 10 | ||||
| -rw-r--r-- | playbooks/gce/openshift-master/config.yml | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/playbooks/aws/openshift-master/config.yml b/playbooks/aws/openshift-master/config.yml index c88828912..454cd6f24 100644 --- a/playbooks/aws/openshift-master/config.yml +++ b/playbooks/aws/openshift-master/config.yml @@ -3,7 +3,7 @@ hosts: localhost gather_facts: no tasks: - - name: Evaluate oo_host_group_exp if it's set + - name: "Evaluate oo_host_group_exp if it's set" add_host: "name={{ item }} groups=oo_hosts_to_config" with_items: "{{ oo_host_group_exp | default('') }}" when: oo_host_group_exp is defined @@ -36,7 +36,7 @@ role: openshift_master, openshift_node_ips: "{{ hostvars['localhost'].openshift_node_ips | default(['']) }}", openshift_env: "{{ oo_env }}" - # TODO: openshift_public_ip: set to aws instance public ip + openshift_public_ip: "{{ ec2_ip_address }}" } - pods - os_env_extras diff --git a/playbooks/aws/openshift-node/config.yml b/playbooks/aws/openshift-node/config.yml index 129464e1f..9662168c4 100644 --- a/playbooks/aws/openshift-node/config.yml +++ b/playbooks/aws/openshift-node/config.yml @@ -23,6 +23,12 @@ | oo_select_keys(groups['tag_env-host-type_' + oo_env + '-openshift-master']) | oo_collect(attribute='ansible_default_ipv4.address') }}" when: groups['tag_env-host-type_' + oo_env + '-openshift-master'] is defined + - name: Setting openshift_master_public_ips fact on localhost + set_fact: + openshift_master_public_ips: "{{ hostvars + | oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-master']) + | oo_collect(attribute='ec2_ip_address') }}" + when: groups['tag_env-host-type-' + oo_env + '-openshift-master'] is defined - name: "Configure instances" hosts: oo_hosts_to_config @@ -36,8 +42,8 @@ - { role: openshift_node, openshift_master_ips: "{{ hostvars['localhost'].openshift_master_ips | default(['']) }}", - # TODO: add openshift_Master_public_ips + openshift_master_public_ips: "{{ hostvars['localhost'].openshift_master_public_ips | default(['']) }}", openshift_env: "{{ oo_env }}" - # TODO: openshift_public_ip: set to aws instance public ip + openshift_public_ip: "{{ ec2_ip_address }}" } - os_env_extras diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml index 7e754074b..ae598b622 100644 --- a/playbooks/gce/openshift-master/config.yml +++ b/playbooks/gce/openshift-master/config.yml @@ -3,7 +3,7 @@ hosts: localhost gather_facts: no tasks: - - name: Evaluate oo_host_group_exp if it's set + - name: "Evaluate oo_host_group_exp if it's set" add_host: "name={{ item }} groups=oo_hosts_to_config" with_items: "{{ oo_host_group_exp | default('') }}" when: oo_host_group_exp is defined |