diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-14 21:22:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 21:22:19 -0800 |
| commit | ec564267f4a25036c92a71be481cfd9e4c03537a (patch) | |
| tree | 0e46cd945ae5ddf1c0fe5ef3411fae10da18c314 /roles/openshift_aws/files | |
| parent | c5afbd8a7643f323f02c3bb1c04cf7f40444995c (diff) | |
| parent | 2a5352ee4fc3962dabd580f7807adb489e8da965 (diff) | |
| download | openshift-ec564267f4a25036c92a71be481cfd9e4c03537a.tar.gz openshift-ec564267f4a25036c92a71be481cfd9e4c03537a.tar.bz2 openshift-ec564267f4a25036c92a71be481cfd9e4c03537a.tar.xz openshift-ec564267f4a25036c92a71be481cfd9e4c03537a.zip | |
Merge pull request #6095 from kwoodson/add_instance_profile_support
Automatic merge from submit-queue.
Instance profile support.
Purpose of this PR is to remove the AWS cloud-provider credentials from the node and use instance profiles during provisioning time.
Diffstat (limited to 'roles/openshift_aws/files')
| -rw-r--r-- | roles/openshift_aws/files/describeinstances.json | 15 | ||||
| -rw-r--r-- | roles/openshift_aws/files/trustpolicy.json | 12 |
2 files changed, 27 insertions, 0 deletions
diff --git a/roles/openshift_aws/files/describeinstances.json b/roles/openshift_aws/files/describeinstances.json new file mode 100644 index 000000000..40de49721 --- /dev/null +++ b/roles/openshift_aws/files/describeinstances.json @@ -0,0 +1,15 @@ +{ + "Version": "2012-10-17", + "Statement": [ + { + "Action": [ + "ec2:DescribeInstances" + ], + "Resource": [ + "*" + ], + "Effect": "Allow", + "Sid": "Stmt1438195894000" + } + ] +} diff --git a/roles/openshift_aws/files/trustpolicy.json b/roles/openshift_aws/files/trustpolicy.json new file mode 100644 index 000000000..87c7d7c42 --- /dev/null +++ b/roles/openshift_aws/files/trustpolicy.json @@ -0,0 +1,12 @@ +{ + "Version": "2012-10-17", + "Statement": [ + { + "Effect": "Allow", + "Principal": { + "Service": "ec2.amazonaws.com" + }, + "Action": "sts:AssumeRole" + } + ] +} |