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 /playbooks/aws/openshift-cluster | |
| 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 'playbooks/aws/openshift-cluster')
| -rw-r--r-- | playbooks/aws/openshift-cluster/provision.yml | 10 | ||||
| -rw-r--r-- | playbooks/aws/openshift-cluster/provision_elb.yml | 9 | ||||
| -rw-r--r-- | playbooks/aws/openshift-cluster/provision_s3.yml | 10 |
3 files changed, 27 insertions, 2 deletions
diff --git a/playbooks/aws/openshift-cluster/provision.yml b/playbooks/aws/openshift-cluster/provision.yml index 7dde60b7d..d538b862d 100644 --- a/playbooks/aws/openshift-cluster/provision.yml +++ b/playbooks/aws/openshift-cluster/provision.yml @@ -1,8 +1,7 @@ --- -- name: Setup the elb and the master node group +- name: Alert user to variables needed hosts: localhost tasks: - - name: Alert user to variables needed - clusterid debug: msg: "openshift_aws_clusterid={{ openshift_aws_clusterid | default('default') }}" @@ -11,6 +10,13 @@ debug: msg: "openshift_aws_region={{ openshift_aws_region | default('us-east-1') }}" +- import_playbook: provision_s3.yml + +- import_playbook: provision_elb.yml + +- name: Create the master node group + hosts: localhost + tasks: - name: provision cluster import_role: name: openshift_aws diff --git a/playbooks/aws/openshift-cluster/provision_elb.yml b/playbooks/aws/openshift-cluster/provision_elb.yml new file mode 100644 index 000000000..9f27dca3b --- /dev/null +++ b/playbooks/aws/openshift-cluster/provision_elb.yml @@ -0,0 +1,9 @@ +--- +- name: Create elb + hosts: localhost + connection: local + tasks: + - name: provision elb + include_role: + name: openshift_aws + tasks_from: provision_elb.yml diff --git a/playbooks/aws/openshift-cluster/provision_s3.yml b/playbooks/aws/openshift-cluster/provision_s3.yml new file mode 100644 index 000000000..45b439083 --- /dev/null +++ b/playbooks/aws/openshift-cluster/provision_s3.yml @@ -0,0 +1,10 @@ +--- +- name: Create s3 bucket + hosts: localhost + connection: local + tasks: + - name: create s3 bucket + include_role: + name: openshift_aws + tasks_from: s3.yml + when: openshift_aws_create_s3 | default(true) | bool |