diff options
| author | Stefanie Forrester <dak1n1@users.noreply.github.com> | 2015-12-02 10:29:09 -0800 |
|---|---|---|
| committer | Stefanie Forrester <dak1n1@users.noreply.github.com> | 2015-12-02 10:29:09 -0800 |
| commit | e14da724f79e1fd75aea03bfab2179c7ef42c3e6 (patch) | |
| tree | 34dc9ea166aeb79fbf995f4f689644a52c361a1b | |
| parent | eb7ddb27be3975d8dbd15d29b2c33b18a050c011 (diff) | |
| parent | af4602744d0a45b858f0cc78d05cf1b70e7fd921 (diff) | |
| download | openshift-e14da724f79e1fd75aea03bfab2179c7ef42c3e6.tar.gz openshift-e14da724f79e1fd75aea03bfab2179c7ef42c3e6.tar.bz2 openshift-e14da724f79e1fd75aea03bfab2179c7ef42c3e6.tar.xz openshift-e14da724f79e1fd75aea03bfab2179c7ef42c3e6.zip | |
Merge pull request #1003 from detiber/fixInstanceTypeLookup
Fix ec2 instance type lookups
| -rw-r--r-- | playbooks/aws/openshift-cluster/tasks/launch_instances.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml index 15e775770..99f0577fc 100644 --- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml @@ -33,25 +33,25 @@ when: ec2_assign_public_ip is not defined - set_fact: - ec2_instance_type: "{{ ec2_master_instance_type | default(lookup('env', 'ec2_master_instance_type') | default(lookup('env', 'ec2_instance_type') | default(deployment_vars[deployment_type].type))) }}" + ec2_instance_type: "{{ ec2_master_instance_type | default(lookup('env', 'ec2_master_instance_type') | default(lookup('env', 'ec2_instance_type') | default(deployment_vars[deployment_type].type, true), true), true) }}" ec2_security_groups: "{{ ec2_master_security_groups | default(deployment_vars[deployment_type].security_groups, true) }}" when: host_type == "master" and sub_host_type == "default" - set_fact: - ec2_instance_type: "{{ ec2_etcd_instance_type | default(lookup('env', 'ec2_etcd_instance_type') | default(lookup('env', 'ec2_instance_type') | default(deployment_vars[deployment_type].type))) }}" + ec2_instance_type: "{{ ec2_etcd_instance_type | default(lookup('env', 'ec2_etcd_instance_type') | default(lookup('env', 'ec2_instance_type') | default(deployment_vars[deployment_type].type, true), true), true) }}" ec2_security_groups: "{{ ec2_etcd_security_groups | default(deployment_vars[deployment_type].security_groups, true)}}" when: host_type == "etcd" and sub_host_type == "default" - set_fact: - ec2_instance_type: "{{ ec2_infra_instance_type | default(lookup('env', 'ec2_infra_instance_type') | default(lookup('env', 'ec2_instance_type') | default(deployment_vars[deployment_type].type))) }}" + ec2_instance_type: "{{ ec2_infra_instance_type | default(lookup('env', 'ec2_infra_instance_type') | default(lookup('env', 'ec2_instance_type') | default(deployment_vars[deployment_type].type, true), true), true) }}" ec2_security_groups: "{{ ec2_infra_security_groups | default(deployment_vars[deployment_type].security_groups, true) }}" when: host_type == "node" and sub_host_type == "infra" - set_fact: - ec2_instance_type: "{{ ec2_node_instance_type | default(lookup('env', 'ec2_node_instance_type') | default(lookup('env', 'ec2_instance_type') | default(deployment_vars[deployment_type].type))) }}" + ec2_instance_type: "{{ ec2_node_instance_type | default(lookup('env', 'ec2_node_instance_type') | default(lookup('env', 'ec2_instance_type') | default(deployment_vars[deployment_type].type, true), true), true) }}" ec2_security_groups: "{{ ec2_node_security_groups | default(deployment_vars[deployment_type].security_groups, true) }}" when: host_type == "node" and sub_host_type == "compute" |