diff --git a/playbooks/openshift-apps/openscanhub.yml b/playbooks/openshift-apps/openscanhub.yml index 51f61ec3df..ffc3ee299c 100644 --- a/playbooks/openshift-apps/openscanhub.yml +++ b/playbooks/openshift-apps/openscanhub.yml @@ -102,6 +102,11 @@ template: etc-resallocserver-pools-configmap.yml objectname: etc-resallocserver-pools-configmap when: env == "staging" + - role: openshift/object + app: openscanhub + template: aws-credentials-configmap.yml + objectname: aws-credentials-configmap + when: env == "staging" - role: openshift/object app: openscanhub file: deployment-resalloc-server.yml diff --git a/roles/openshift-apps/openscanhub/files/deployment-resalloc-server.yml b/roles/openshift-apps/openscanhub/files/deployment-resalloc-server.yml index 8c4150fb37..94b16977f2 100644 --- a/roles/openshift-apps/openscanhub/files/deployment-resalloc-server.yml +++ b/roles/openshift-apps/openscanhub/files/deployment-resalloc-server.yml @@ -59,6 +59,9 @@ spec: - mountPath: /etc/resallocserver/pools.yaml name: etc-resallocserver-pools-configmap subPath: pools.yaml + - mountPath: /var/lib/resallocserver/.aws/credentials + name: aws-credentials-configmap + subPath: credentials dnsPolicy: ClusterFirst restartPolicy: Always schedulerName: default-scheduler @@ -71,3 +74,6 @@ spec: - name: etc-resallocserver-pools-configmap configMap: name: etc-resallocserver-pools-config + - name: aws-credentials-configmap + configMap: + name: aws-credentials-config diff --git a/roles/openshift-apps/openscanhub/templates/aws-credentials b/roles/openshift-apps/openscanhub/templates/aws-credentials new file mode 100644 index 0000000000..33216d7d81 --- /dev/null +++ b/roles/openshift-apps/openscanhub/templates/aws-credentials @@ -0,0 +1,3 @@ +[default] +aws_access_key_id = {{ openscanhub_aws_access_key_id }} +aws_secret_access_key = {{ openscanhub_aws_secret_access_key }} diff --git a/roles/openshift-apps/openscanhub/templates/aws-credentials-configmap.yml b/roles/openshift-apps/openscanhub/templates/aws-credentials-configmap.yml new file mode 100644 index 0000000000..9bdfdfa49f --- /dev/null +++ b/roles/openshift-apps/openscanhub/templates/aws-credentials-configmap.yml @@ -0,0 +1,15 @@ +{% macro load_file(filename) %}{% include filename %}{%- endmacro -%} +--- +apiVersion: v1 +kind: List +metadata: {} +items: +- apiVersion: v1 + kind: ConfigMap + metadata: + name: aws-credentials-config + labels: + app: openscanhub + data: + credentials: |- + {{ load_file('aws-credentials') | indent(6) }}