diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-12-12 09:15:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-12 09:15:52 -0500 |
commit | 01ae634a0bf89fe840006f9139f8ffd20e09afc8 (patch) | |
tree | d53a7c03e4855885e124559018fff32adeaaf4ea /roles/openshift_aws/tasks/provision_nodes.yml | |
parent | 0b6fa3dcd40c2dd1f42fcceb52f82c2a28ed96e2 (diff) | |
parent | 35c1abb6050f2cd1f31396edd42618a2998bd546 (diff) | |
download | openshift-01ae634a0bf89fe840006f9139f8ffd20e09afc8.tar.gz openshift-01ae634a0bf89fe840006f9139f8ffd20e09afc8.tar.bz2 openshift-01ae634a0bf89fe840006f9139f8ffd20e09afc8.tar.xz openshift-01ae634a0bf89fe840006f9139f8ffd20e09afc8.zip |
Merge pull request #6335 from kwoodson/node_groups_refactor
Node group management update.
Diffstat (limited to 'roles/openshift_aws/tasks/provision_nodes.yml')
-rw-r--r-- | roles/openshift_aws/tasks/provision_nodes.yml | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/roles/openshift_aws/tasks/provision_nodes.yml b/roles/openshift_aws/tasks/provision_nodes.yml index 041ed0791..d82f18574 100644 --- a/roles/openshift_aws/tasks/provision_nodes.yml +++ b/roles/openshift_aws/tasks/provision_nodes.yml @@ -3,7 +3,7 @@ # bootstrap should be created on first master # need to fetch it and shove it into cloud data - name: fetch master instances - ec2_remote_facts: + ec2_instance_facts: region: "{{ openshift_aws_region }}" filters: "tag:clusterid": "{{ openshift_aws_clusterid }}" @@ -31,20 +31,15 @@ - name: include build compute and infra node groups include_tasks: build_node_group.yml + with_items: "{{ openshift_aws_node_groups }}" vars: - l_nodes_to_build: "{{ openshift_aws_node_group_config }}" - l_launch_config_security_groups: "{{ openshift_aws_launch_config_security_groups }}" - l_aws_ami_map: "{{ openshift_aws_ami_map }}" - -- name: include build node group for extra nodes - include_tasks: build_node_group.yml - when: openshift_aws_node_group_config_extra is defined - vars: - l_nodes_to_build: "{{ openshift_aws_node_group_config_extra | default({}) }}" - l_launch_config_security_groups: "{{ openshift_aws_launch_config_security_groups_extra }}" - l_aws_ami_map: "{{ openshift_aws_ami_map_extra }}" + l_node_group_config: "{{ openshift_aws_node_group_config }}" + loop_control: + loop_var: openshift_aws_node_group # instances aren't scaling fast enough here, we need to wait for them - when: openshift_aws_wait_for_ssh | bool name: wait for our new nodes to come up include_tasks: wait_for_groups.yml + vars: + created_asgs: "{{ openshift_aws_created_asgs }}" |