diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-01 11:43:48 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-01 11:43:48 -0500 |
| commit | 3d3053062ee3bca175df6eb4dd66ff56237234ca (patch) | |
| tree | ebc814ec2f1ccaaf12e4ab3be1b5395dd82c5408 /playbooks/aws | |
| parent | b0961af3b0ee955be033fc043b1e072097dfbd69 (diff) | |
| parent | 1a5b22dd4f4dd3a1643abc14bdbae045999cea44 (diff) | |
| download | openshift-3d3053062ee3bca175df6eb4dd66ff56237234ca.tar.gz openshift-3d3053062ee3bca175df6eb4dd66ff56237234ca.tar.bz2 openshift-3d3053062ee3bca175df6eb4dd66ff56237234ca.tar.xz openshift-3d3053062ee3bca175df6eb4dd66ff56237234ca.zip | |
Merge pull request #1237 from detiber/infra_fixes
infra_node fixes
Diffstat (limited to 'playbooks/aws')
| -rw-r--r-- | playbooks/aws/openshift-cluster/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/aws/openshift-cluster/terminate.yml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml index abdb23d78..0b6edd70b 100644 --- a/playbooks/aws/openshift-cluster/config.yml +++ b/playbooks/aws/openshift-cluster/config.yml @@ -1,4 +1,3 @@ ---- - include: ../../common/openshift-cluster/config.yml vars_files: - ../../aws/openshift-cluster/vars.yml @@ -12,3 +11,6 @@ openshift_deployment_type: "{{ deployment_type }}" openshift_hostname: "{{ ec2_private_ip_address }}" openshift_public_hostname: "{{ ec2_ip_address }}" + openshift_router_selector: 'type=infra' + openshift_infra_nodes: "{{ g_infra_hosts }}" + openshift_node_labels: '{"region": "{{ ec2_region }}", "type": "{{ hostvars[inventory_hostname]["ec2_tag_sub-host-type"] if inventory_hostname in groups["tag_host-type_node"] else hostvars[inventory_hostname]["ec2_tag_host-type"] }}"}' diff --git a/playbooks/aws/openshift-cluster/terminate.yml b/playbooks/aws/openshift-cluster/terminate.yml index 4b9c80b14..c20f370bf 100644 --- a/playbooks/aws/openshift-cluster/terminate.yml +++ b/playbooks/aws/openshift-cluster/terminate.yml @@ -74,4 +74,4 @@ tags: Name: "{{ item.item.item.ec2_tag_Name }}-terminate" with_items: ec2_stop.results - when: "'oo_hosts_to_terminate' in groups" + when: ec2_stop | changed |