diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-01 14:52:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-01 14:52:47 -0400 |
| commit | 4538366d8e7533ef5b82b9d073fd0212e7321c0c (patch) | |
| tree | 9864348e5e23493152371733d636641994d00fc8 | |
| parent | 1b146b956a8c3f8395ed68807443019120f127fa (diff) | |
| parent | c0fb9d3cc016656a78e7ac077342e31eace622e5 (diff) | |
| download | openshift-4538366d8e7533ef5b82b9d073fd0212e7321c0c.tar.gz openshift-4538366d8e7533ef5b82b9d073fd0212e7321c0c.tar.bz2 openshift-4538366d8e7533ef5b82b9d073fd0212e7321c0c.tar.xz openshift-4538366d8e7533ef5b82b9d073fd0212e7321c0c.zip | |
Merge pull request #2313 from mdanter/unschedulableMasterAsNode
In AWS where the master node was not part of the nodes and unschedulable
| -rw-r--r-- | playbooks/aws/openshift-cluster/config.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml index 647c72239..05cfe7d6e 100644 --- a/playbooks/aws/openshift-cluster/config.yml +++ b/playbooks/aws/openshift-cluster/config.yml @@ -30,7 +30,7 @@ openshift_hosted_router_selector: 'type=infra' openshift_node_labels: region: "{{ deployment_vars[deployment_type].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'] }}" + type: "{{ hostvars[inventory_hostname]['ec2_tag_sub-host-type'] }}" openshift_master_cluster_method: 'native' openshift_use_openshift_sdn: "{{ lookup('oo_option', 'use_openshift_sdn') }}" os_sdn_network_plugin_name: "{{ lookup('oo_option', 'sdn_network_plugin_name') }}" |