diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-12 09:08:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-12 09:08:02 -0700 |
| commit | e3c8b0065af5c7ecfc3746e65620ba7db0ebcf0e (patch) | |
| tree | 8db5ee2fb192696860a8892ebd41fc822179caa1 /playbooks/aws/openshift-cluster | |
| parent | 45725a38dd8ee6db16a89144f1e14c30f98440b8 (diff) | |
| parent | 0cf1f1f615d978001b1084e5827cf79add0caaef (diff) | |
| download | openshift-e3c8b0065af5c7ecfc3746e65620ba7db0ebcf0e.tar.gz openshift-e3c8b0065af5c7ecfc3746e65620ba7db0ebcf0e.tar.bz2 openshift-e3c8b0065af5c7ecfc3746e65620ba7db0ebcf0e.tar.xz openshift-e3c8b0065af5c7ecfc3746e65620ba7db0ebcf0e.zip | |
Merge pull request #5690 from mgugino-upstream-stage/provisioning-docs
Automatic merge from submit-queue.
Provisioning Documentation Updates
Updating provisioning documents.
Also moved some steps from build_ami.yml to a new
play for better reusability.
Diffstat (limited to 'playbooks/aws/openshift-cluster')
| -rw-r--r-- | playbooks/aws/openshift-cluster/build_ami.yml | 8 | ||||
| -rw-r--r-- | playbooks/aws/openshift-cluster/prerequisites.yml | 8 | ||||
| -rw-r--r-- | playbooks/aws/openshift-cluster/provisioning_vars.example.yml | 28 |
3 files changed, 8 insertions, 36 deletions
diff --git a/playbooks/aws/openshift-cluster/build_ami.yml b/playbooks/aws/openshift-cluster/build_ami.yml index 1ab1e8041..559a37cbe 100644 --- a/playbooks/aws/openshift-cluster/build_ami.yml +++ b/playbooks/aws/openshift-cluster/build_ami.yml @@ -17,14 +17,6 @@ - name: openshift_aws_region msg: "openshift_aws_region={{ openshift_aws_region | default('us-east-1') }}" -- include: provision_vpc.yml - -- include: provision_ssh_keypair.yml - -- include: provision_sec_group.yml - vars: - openshift_aws_node_group_type: compute - - include: provision_instance.yml vars: openshift_aws_node_group_type: compute diff --git a/playbooks/aws/openshift-cluster/prerequisites.yml b/playbooks/aws/openshift-cluster/prerequisites.yml new file mode 100644 index 000000000..df77fe3bc --- /dev/null +++ b/playbooks/aws/openshift-cluster/prerequisites.yml @@ -0,0 +1,8 @@ +--- +- include: provision_vpc.yml + +- include: provision_ssh_keypair.yml + +- include: provision_sec_group.yml + vars: + openshift_aws_node_group_type: compute diff --git a/playbooks/aws/openshift-cluster/provisioning_vars.example.yml b/playbooks/aws/openshift-cluster/provisioning_vars.example.yml deleted file mode 100644 index 28eb9c993..000000000 --- a/playbooks/aws/openshift-cluster/provisioning_vars.example.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -# when creating an AMI set this option to True -# when installing the cluster, set this to False -openshift_node_bootstrap: True - -# specify a clusterid -#openshift_aws_clusterid: default - -# must specify a base_ami when building an AMI -#openshift_aws_base_ami: - -# when creating an encrypted AMI please specify use_encryption -#openshift_aws_ami_encrypt: False - -# custom certificates are required for the ELB -#openshift_aws_iam_cert_path: '/path/to/wildcard.<clusterid>.example.com.crt' -#openshift_aws_iam_key_path: '/path/to/wildcard.<clusterid>.example.com.key' -#openshift_aws_iam_cert_chain_path: '/path/to/cert.ca.crt' - -# This is required for any ec2 instances -#openshift_aws_ssh_key_name: myuser_key - -# This will ensure these users are created -#openshift_aws_users: -#- key_name: myuser_key -# username: myuser -# pub_key: | -# ssh-rsa AAAA |