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/cluster-operator/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 'playbooks/cluster-operator/aws')
| -rw-r--r-- | playbooks/cluster-operator/aws/infrastructure.yml | 21 | ||||
| l--------- | playbooks/cluster-operator/aws/roles | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/playbooks/cluster-operator/aws/infrastructure.yml b/playbooks/cluster-operator/aws/infrastructure.yml new file mode 100644 index 000000000..9669820fb --- /dev/null +++ b/playbooks/cluster-operator/aws/infrastructure.yml @@ -0,0 +1,21 @@ +--- +- 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') }}" + + - name: Alert user to variables needed - region + debug: + msg: "openshift_aws_region={{ openshift_aws_region | default('us-east-1') }}" + +- import_playbook: ../../aws/openshift-cluster/provision_vpc.yml + +- import_playbook: ../../aws/openshift-cluster/provision_ssh_keypair.yml + +- import_playbook: ../../aws/openshift-cluster/provision_sec_group.yml + +- import_playbook: ../../aws/openshift-cluster/provision_s3.yml + +- import_playbook: ../../aws/openshift-cluster/provision_elb.yml diff --git a/playbooks/cluster-operator/aws/roles b/playbooks/cluster-operator/aws/roles new file mode 120000 index 000000000..20c4c58cf --- /dev/null +++ b/playbooks/cluster-operator/aws/roles @@ -0,0 +1 @@ +../../../roles
\ No newline at end of file |