diff --git a/playbooks/openshift-apps/openscanhub.yml b/playbooks/openshift-apps/openscanhub.yml index 8a443cc5f5..6e3aec7970 100644 --- a/playbooks/openshift-apps/openscanhub.yml +++ b/playbooks/openshift-apps/openscanhub.yml @@ -92,6 +92,11 @@ when: env == "staging" # Configurations for resalloc-server. + - role: openshift/object + app: openscanhub + template: etc-resallocserver-server-configmap.yml + objectname: etc-resallocserver-server-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 1a060a1c37..d14ef526df 100644 --- a/roles/openshift-apps/openscanhub/files/deployment-resalloc-server.yml +++ b/roles/openshift-apps/openscanhub/files/deployment-resalloc-server.yml @@ -52,8 +52,16 @@ spec: resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File + volumeMounts: + - mountPath: /etc/resallocserver/server.yaml + name: etc-resallocserver-server-configmap + subPath: server.yaml dnsPolicy: ClusterFirst restartPolicy: Always schedulerName: default-scheduler securityContext: {} terminationGracePeriodSeconds: 30 + volumes: + - name: etc-resallocserver-server-configmap + configMap: + name: etc-resallocserver-server-config diff --git a/roles/openshift-apps/openscanhub/templates/etc-resallocserver-server-configmap.yml b/roles/openshift-apps/openscanhub/templates/etc-resallocserver-server-configmap.yml new file mode 100644 index 0000000000..598ac0b554 --- /dev/null +++ b/roles/openshift-apps/openscanhub/templates/etc-resallocserver-server-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: etc-resallocserver-server-config + labels: + app: openscanhub + data: + etc-resallocserver-server.yaml: |- + {{ load_file('etc-resallocserver-server.yaml') | indent(6) }} diff --git a/roles/openshift-apps/openscanhub/templates/etc-resallocserver-server.yaml b/roles/openshift-apps/openscanhub/templates/etc-resallocserver-server.yaml new file mode 100644 index 0000000000..2614784ddf --- /dev/null +++ b/roles/openshift-apps/openscanhub/templates/etc-resallocserver-server.yaml @@ -0,0 +1,25 @@ +# SQLALCHEMY connection url. Note that using sqlite has serious limits WRT to +# alembic migrations support (so it is discouraged in production). Make sure +# you have installed appropriate libraries for desired SQL dialect, for +# appropriate python version! +# +#For PostgreSQL connection without password using unix socket auth method. +#db_url: 'postgresql://resalloc@/resalloc' +#For PostgreSQL listening on host/port, using password. +{% if env == 'staging' %} +db_url: 'postgresql://openscanhub_resalloc:{{ openscanhub_resalloc_db_password_stg }}@db01.stg.iad2.fedoraproject.org:5432/openscanhub_resalloc' +{% else %} +db_url: 'postgresql://openscanhub_resalloc:{{ openscanhub_resalloc_db_password }}@db01.iad2.fedoraproject.org:5432/openscanhub_resalloc' +{% endif %} +#db_url: 'sqlite:////var/lib/resallocserver/db.sqlite' + +logdir: '/var/log/resallocserver' + +# Hostname to make the xmlrpc server listen on. +hostname: '0.0.0.0' + +# Port to make the xmlrpc server listen on. +#port: 49100 + +# Set to 'debug' to get more verbose logging. +loglevel: debug