Skip to content

Commit

Permalink
Merge pull request #4645 from gaurav-nelson/Bug1462823Fixes
Browse files Browse the repository at this point in the history
Bug#1462823 - Fixes
  • Loading branch information
Gaurav Nelson committed Jun 26, 2017
2 parents 67c574c + d67bab7 commit 32eaf45
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions install_config/configuring_aws.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Zone = us-east-1c <1>
<1> This is the Availability Zone of your AWS Instance and where your EBS Volume
resides; this information is obtained from the AWS Managment Console.
====

[[aws-configuring-masters]]
== Configuring {product-title} Masters for AWS

Expand All @@ -45,12 +45,12 @@ You can set the AWS configuration on your {product-title} master hosts in two wa
=== Configuring {product-title} for AWS with Ansible

During
xref:../install_config/install/advanced_install.adoc#install-config-install-advanced-install[advanced installations],
AWS can be configured using
xref:../install_config/install/advanced_install.adoc#advanced-install-configuring-global-proxy[the `*openshift_cloudprovider_aws_access_key*`, `*openshift_cloudprovider_aws_secret_key*`, and `*openshift_cloudprovider_kind*` parameters], which are configurable in the inventory file.
xref:../install_config/install/advanced_install.adoc#install-config-install-advanced-install[advanced installations],
AWS can be configured using
xref:../install_config/install/advanced_install.adoc#advanced-install-configuring-global-proxy[the `*openshift_cloudprovider_aws_access_key*`, `*openshift_cloudprovider_aws_secret_key*`, and `*openshift_cloudprovider_kind*` parameters], which are configurable in the inventory file.

.Example AWS Configuration with Ansible
====

----
# Cloud Provider Configuration
#
Expand All @@ -60,13 +60,15 @@ xref:../install_config/install/advanced_install.adoc#advanced-install-configurin
#openshift_cloudprovider_aws_access_key="{{ lookup('env','AWS_ACCESS_KEY_ID') }}"
#openshift_cloudprovider_aws_secret_key="{{ lookup('env','AWS_SECRET_ACCESS_KEY') }}"
#
# AWS
# AWS (Using API Credentials)
#openshift_cloudprovider_kind=aws
# Note: IAM profiles may be used instead of storing API credentials on disk.
#openshift_cloudprovider_aws_access_key=aws_access_key_id
#openshift_cloudprovider_aws_secret_key=aws_secret_access_key
#
# AWS (Using IAM Profiles)
#openshift_cloudprovider_kind=aws
# Note: IAM roles must exist before launching the instances.
----
====

[NOTE]
====
Expand Down

0 comments on commit 32eaf45

Please sign in to comment.