summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks/main.yml
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-10-02 18:59:40 -0400
committerMichael Gugino <mgugino@redhat.com>2017-10-02 18:59:40 -0400
commit0827fe8dda5fb4eac0c41b7936db46fbbcca603d (patch)
treeaf5b56a56e3ef7897c8048551fdf78bcbd3afe86 /roles/openshift_node/tasks/main.yml
parentd937aa5981afa9133b1a160329d36b763803f402 (diff)
downloadopenshift-0827fe8dda5fb4eac0c41b7936db46fbbcca603d.tar.gz
openshift-0827fe8dda5fb4eac0c41b7936db46fbbcca603d.tar.bz2
openshift-0827fe8dda5fb4eac0c41b7936db46fbbcca603d.tar.xz
openshift-0827fe8dda5fb4eac0c41b7936db46fbbcca603d.zip
Move node aws credentials to config.yml
Currently, the node service is started before aws credentials (if needed) are configured. This commit ensures the aws credentials are placed before the node service is started. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497150
Diffstat (limited to 'roles/openshift_node/tasks/main.yml')
-rw-r--r--roles/openshift_node/tasks/main.yml16
1 files changed, 0 insertions, 16 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index e82fb42b8..59b8bb76e 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -76,22 +76,6 @@
include: config.yml
when: not openshift_node_bootstrap
-- name: Configure AWS Cloud Provider Settings
- lineinfile:
- dest: /etc/sysconfig/{{ openshift.common.service_type }}-node
- regexp: "{{ item.regex }}"
- line: "{{ item.line }}"
- create: true
- with_items:
- - regex: '^AWS_ACCESS_KEY_ID='
- line: "AWS_ACCESS_KEY_ID={{ openshift_cloudprovider_aws_access_key | default('') }}"
- - regex: '^AWS_SECRET_ACCESS_KEY='
- line: "AWS_SECRET_ACCESS_KEY={{ openshift_cloudprovider_aws_secret_key | default('') }}"
- no_log: True
- when: openshift_cloudprovider_kind is defined and openshift_cloudprovider_kind == 'aws' and openshift_cloudprovider_aws_access_key is defined and openshift_cloudprovider_aws_secret_key is defined
- notify:
- - restart node
-
#### Storage class plugins here ####
- name: NFS storage plugin configuration
include: storage_plugins/nfs.yml