diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-31 11:48:36 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-31 11:48:36 -0400 |
| commit | 272ee48caeeab8692f40f0f667e931879f9a0494 (patch) | |
| tree | 45115294ea2abb78c2a1ccbbd36cbfbca581ca32 /roles/openshift_node | |
| parent | f7a9a0ce7a5057a25cea7e9f66576101a9e9f43a (diff) | |
| parent | 67fda43df08a260571eb9b1d7f1ecdab5e323c41 (diff) | |
| download | openshift-272ee48caeeab8692f40f0f667e931879f9a0494.tar.gz openshift-272ee48caeeab8692f40f0f667e931879f9a0494.tar.bz2 openshift-272ee48caeeab8692f40f0f667e931879f9a0494.tar.xz openshift-272ee48caeeab8692f40f0f667e931879f9a0494.zip | |
Merge pull request #1634 from abutcher/aws-cloud-provider
AWS cloud provider
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/roles/openshift_node/meta/main.yml b/roles/openshift_node/meta/main.yml index 702012489..62a8480c8 100644 --- a/roles/openshift_node/meta/main.yml +++ b/roles/openshift_node/meta/main.yml @@ -14,3 +14,4 @@ galaxy_info: dependencies: - role: openshift_common - role: openshift_docker +- role: openshift_cloud_provider diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 993c8c0cd..80b3e710d 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -81,6 +81,21 @@ notify: - restart node +- 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 }}" + - regex: '^AWS_SECRET_ACCESS_KEY=' + line: "AWS_SECRET_ACCESS_KEY={{ openshift.cloudprovider.aws.secret_key }}" + when: "'cloudprovider' in openshift and 'aws' in openshift.cloudprovider and openshift.cloudprovider.kind == 'aws' and 'access_key' in openshift.cloudprovider.aws and 'secret_key' in openshift.cloudprovider.aws" + notify: + - restart node + - name: Additional storage plugin configuration include: storage_plugins/main.yml |