diff --git a/playbooks/openshift-apps/resultsdb.yml b/playbooks/openshift-apps/resultsdb.yml index e1b463587d..8a90193c80 100644 --- a/playbooks/openshift-apps/resultsdb.yml +++ b/playbooks/openshift-apps/resultsdb.yml @@ -30,6 +30,8 @@ - name: make the app be real # hosts: os_masters[0]:os_masters_stg[0] hosts: os_masters_stg[0] + hosts: local + connection: local user: root gather_facts: False @@ -104,7 +106,7 @@ routename: api-pretty host: "resultsdb{{ env_suffix }}.fedoraproject.org" serviceport: api - servicename: resultsdb-web + servicename: resultsdb-api - role: openshift/rollout app: resultsdb diff --git a/roles/openshift-apps/resultsdb/templates/configmaps.yml b/roles/openshift-apps/resultsdb/templates/configmaps.yml index 8780af7b83..eb030e94ea 100644 --- a/roles/openshift-apps/resultsdb/templates/configmaps.yml +++ b/roles/openshift-apps/resultsdb/templates/configmaps.yml @@ -25,8 +25,8 @@ data: Require valid-user +{% if deployment_type not in ['local', 'dev'] %} --- -{% if deployment_type not in ['local', 'dev']%} apiVersion: v1 kind: ConfigMap metadata: diff --git a/roles/openshift-apps/resultsdb/templates/deploymentconfigs.yml b/roles/openshift-apps/resultsdb/templates/deploymentconfigs.yml index 07f407fcd0..58b6f80ec9 100644 --- a/roles/openshift-apps/resultsdb/templates/deploymentconfigs.yml +++ b/roles/openshift-apps/resultsdb/templates/deploymentconfigs.yml @@ -58,6 +58,7 @@ spec: - name: httpd-config-volume mountPath: /etc/httpd/conf.d readOnly: true +{% if deployment_type not in ['local', 'dev']%} - name: fedora-messaging-ca-volume mountPath: /etc/pki/rabbitmq/ca readOnly: true @@ -70,6 +71,7 @@ spec: - name: fedora-messaging-config-volume mountPath: /etc/fedora-messaging readOnly: true +{% endif %} readinessProbe: timeoutSeconds: 1 initialDelaySeconds: 5 @@ -96,6 +98,7 @@ spec: - name: httpd-config-volume configMap: name: "resultsdb-httpd-config" +{% if deployment_type not in ['local', 'dev']%} - name: fedora-messaging-config-volume configMap: name: fedora-messaging-configmap @@ -108,5 +111,6 @@ spec: - name: fedora-messaging-key-volume secret: secretName: resultsdb-fedora-messaging-key +{% endif %} triggers: - - type: ConfigChange \ No newline at end of file + - type: ConfigChange} diff --git a/roles/openshift-apps/resultsdb/vars/main.yml b/roles/openshift-apps/resultsdb/vars/main.yml index 95d9ed46c2..34ceba4b1f 100644 --- a/roles/openshift-apps/resultsdb/vars/main.yml +++ b/roles/openshift-apps/resultsdb/vars/main.yml @@ -1,6 +1,4 @@ resultsdb_publish: true resultsdb_mod_wsgi_dir: '${MOD_WSGI_MODULES_DIRECTORY}' -resultsdb_additional_result_outcomes: [] - -resultsdb_image: quay.io/fedora/resultsdb:latest \ No newline at end of file +resultsdb_additional_result_outcomes: [] \ No newline at end of file