diff options
author | Kenny Woodson <kwoodson@redhat.com> | 2017-11-08 15:51:17 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-08 15:51:17 -0500 |
commit | a7172e8482124feeccf07671fc8263a79fc281a0 (patch) | |
tree | 1838759eba169d41807ec7ed2e0dd319269210ae /roles/openshift_aws/tasks/provision_nodes.yml | |
parent | 52d2eb56e3198ed83c7c9a912aa22919e2180985 (diff) | |
parent | 8757073d8509a6301b70ff66383d84416bdd78cb (diff) | |
download | openshift-a7172e8482124feeccf07671fc8263a79fc281a0.tar.gz openshift-a7172e8482124feeccf07671fc8263a79fc281a0.tar.bz2 openshift-a7172e8482124feeccf07671fc8263a79fc281a0.tar.xz openshift-a7172e8482124feeccf07671fc8263a79fc281a0.zip |
Merge pull request #6016 from kwoodson/bootstrap_enhancements-v3
Bootstrap enhancements.
Diffstat (limited to 'roles/openshift_aws/tasks/provision_nodes.yml')
-rw-r--r-- | roles/openshift_aws/tasks/provision_nodes.yml | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/roles/openshift_aws/tasks/provision_nodes.yml b/roles/openshift_aws/tasks/provision_nodes.yml index fc4996c68..1b40f24d3 100644 --- a/roles/openshift_aws/tasks/provision_nodes.yml +++ b/roles/openshift_aws/tasks/provision_nodes.yml @@ -25,19 +25,23 @@ set_fact: openshift_aws_launch_config_bootstrap_token: "{{ bootstrap['content'] | b64decode }}" -- name: include build node group for infra +- include: vpc_and_subnet_id.yml + +- name: include build compute and infra node groups include: build_node_group.yml vars: - openshift_aws_node_group_type: infra - openshift_aws_scale_group_name: "{{ openshift_aws_clusterid }} openshift infra" - openshift_aws_launch_config_name: "{{ openshift_aws_clusterid }}-infra-{{ ansible_date_time.epoch }}" + 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 compute +- name: include build node group for extra nodes include: build_node_group.yml + when: openshift_aws_node_group_config_extra is defined vars: - openshift_aws_node_group_type: compute - openshift_aws_scale_group_name: "{{ openshift_aws_clusterid }} openshift compute" - openshift_aws_launch_config_name: "{{ openshift_aws_clusterid }}-compute-{{ ansible_date_time.epoch }}" + 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 }}" + - when: openshift_aws_wait_for_ssh | bool block: |