diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-14 16:04:01 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-14 16:04:01 -0300 |
| commit | 03f31fdc581eea090388b5a60b3818167eb47c0c (patch) | |
| tree | 75a29846b763d24bf52c98f786ce1b6189c3a626 /playbooks/aws | |
| parent | 3073846a8c9e02af06d4d56f0141766b2337424b (diff) | |
| parent | faf5618ec483baa7618f02de91128e8f1eaaa471 (diff) | |
| download | openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.tar.gz openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.tar.bz2 openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.tar.xz openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'playbooks/aws')
| -rw-r--r-- | playbooks/aws/openshift-cluster/config.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml index 4839c100b..71ce9e787 100644 --- a/playbooks/aws/openshift-cluster/config.yml +++ b/playbooks/aws/openshift-cluster/config.yml @@ -23,9 +23,8 @@ openshift_debug_level: "{{ debug_level }}" openshift_deployment_type: "{{ deployment_type }}" openshift_public_hostname: "{{ ec2_ip_address }}" - openshift_registry_selector: 'type=infra' + openshift_hosted_registry_selector: 'type=infra' openshift_hosted_router_selector: 'type=infra' - openshift_infra_nodes: "{{ g_infra_hosts }}" 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'] }}" |