diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-15 13:58:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 13:58:45 -0800 |
| commit | ba3abc672da4b588b906b99ea515f171dcd8da5a (patch) | |
| tree | 648431821187c5a49a86aa456cf6d53d044fe05d /roles/openshift_aws | |
| parent | c81d1ba2408137d64009bbc4842123835a2be41f (diff) | |
| parent | 4bc8d5c7b89dda0a46a009de5a0830efb904d2e2 (diff) | |
| download | openshift-ba3abc672da4b588b906b99ea515f171dcd8da5a.tar.gz openshift-ba3abc672da4b588b906b99ea515f171dcd8da5a.tar.bz2 openshift-ba3abc672da4b588b906b99ea515f171dcd8da5a.tar.xz openshift-ba3abc672da4b588b906b99ea515f171dcd8da5a.zip | |
Merge pull request #6692 from abutcher/cluster-operator
Automatic merge from submit-queue.
Separate ELB & S3 from master node group provisioning
Moved s3 and elb provisioning out of `roles/openshift_aws/tasks/provisioning.yml` and into their own playbooks. These playbooks are now included in the provision playbook and in a WIP infrastructure playbook we intend to run up front in place of prerequisites.
@kwoodson what are your thoughts on something like this?
Diffstat (limited to 'roles/openshift_aws')
| -rw-r--r-- | roles/openshift_aws/tasks/provision.yml | 17 | ||||
| -rw-r--r-- | roles/openshift_aws/tasks/provision_elb.yml | 15 |
2 files changed, 15 insertions, 17 deletions
diff --git a/roles/openshift_aws/tasks/provision.yml b/roles/openshift_aws/tasks/provision.yml index 786a2e4cf..2b5f317d8 100644 --- a/roles/openshift_aws/tasks/provision.yml +++ b/roles/openshift_aws/tasks/provision.yml @@ -1,23 +1,6 @@ --- -- when: openshift_aws_create_iam_cert | bool - name: create the iam_cert for elb certificate - include_tasks: iam_cert.yml - -- when: openshift_aws_create_s3 | bool - name: create s3 bucket for registry - include_tasks: s3.yml - - include_tasks: vpc_and_subnet_id.yml -- name: create elbs - include_tasks: elb.yml - with_dict: "{{ openshift_aws_elb_dict }}" - vars: - l_elb_security_groups: "{{ openshift_aws_elb_security_groups }}" - l_openshift_aws_elb_name_dict: "{{ openshift_aws_elb_name_dict }}" - loop_control: - loop_var: l_elb_dict_item - - name: include scale group creation for master include_tasks: build_node_group.yml with_items: "{{ openshift_aws_master_group }}" diff --git a/roles/openshift_aws/tasks/provision_elb.yml b/roles/openshift_aws/tasks/provision_elb.yml new file mode 100644 index 000000000..a52f63bd5 --- /dev/null +++ b/roles/openshift_aws/tasks/provision_elb.yml @@ -0,0 +1,15 @@ +--- +- when: openshift_aws_create_iam_cert | bool + name: create the iam_cert for elb certificate + include_tasks: iam_cert.yml + +- include_tasks: vpc_and_subnet_id.yml + +- name: create elbs + include_tasks: elb.yml + with_dict: "{{ openshift_aws_elb_dict }}" + vars: + l_elb_security_groups: "{{ openshift_aws_elb_security_groups }}" + l_openshift_aws_elb_name_dict: "{{ openshift_aws_elb_name_dict }}" + loop_control: + loop_var: l_elb_dict_item |