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_node | |
| 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_node')
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/bootstrap.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/config.yml | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index 0c6d8db38..85ad33ad3 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -115,3 +115,5 @@ openshift_node_config_dir: "{{ openshift_node_config_dir_default }}" openshift_node_image_config_latest_default: "{{ openshift_image_config_latest | default(False) }}" openshift_node_image_config_latest: "{{ openshift_node_image_config_latest_default }}" + +openshift_node_use_instance_profiles: False diff --git a/roles/openshift_node/tasks/bootstrap.yml b/roles/openshift_node/tasks/bootstrap.yml index 8cf41ab4c..b8be50f6c 100644 --- a/roles/openshift_node/tasks/bootstrap.yml +++ b/roles/openshift_node/tasks/bootstrap.yml @@ -34,6 +34,7 @@ - name: include aws sysconfig credentials include: aws.yml static: yes + when: not (openshift_node_use_instance_profiles | default(False)) #- name: update the ExecStart to have bootstrap # lineinfile: diff --git a/roles/openshift_node/tasks/config.yml b/roles/openshift_node/tasks/config.yml index c08f43118..2fea33454 100644 --- a/roles/openshift_node/tasks/config.yml +++ b/roles/openshift_node/tasks/config.yml @@ -49,6 +49,7 @@ - name: include aws provider credentials include: aws.yml static: yes + when: not (openshift_node_use_instance_profiles | default(False)) # Necessary because when you're on a node that's also a master the master will be # restarted after the node restarts docker and it will take up to 60 seconds for |