summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLénaïc Huard <lhuard@amadeus.com>2015-02-19 23:39:02 +0100
committerLénaïc Huard <lhuard@amadeus.com>2015-03-10 10:14:59 +0100
commitb6300dd7139ef37a039831bab6064179e3398d88 (patch)
tree57284918fb5a81d39b7cb4eb7deafc02d17975ab
parentf8df2a785f791151e11f8274711c5d4405e550eb (diff)
downloadopenshift-b6300dd7139ef37a039831bab6064179e3398d88.tar.gz
openshift-b6300dd7139ef37a039831bab6064179e3398d88.tar.bz2
openshift-b6300dd7139ef37a039831bab6064179e3398d88.tar.xz
openshift-b6300dd7139ef37a039831bab6064179e3398d88.zip
Fix AWS playbooks
-rw-r--r--playbooks/aws/openshift-master/config.yml4
-rw-r--r--playbooks/aws/openshift-node/config.yml10
-rw-r--r--playbooks/gce/openshift-master/config.yml2
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