put database service name in so sonarqube will actually deploy (#206)

redhat-cop · Apr 19, 2019 · 9f719f6 · 9f719f6
1 parent 4e9da1b
commit 9f719f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sonarqube/.applier/group_vars/seed-hosts.yml b/sonarqube/.applier/group_vars/seed-hosts.yml
@@ -7,14 +7,14 @@ build:
   SOURCE_REPOSITORY_REF: master
   SOURCE_CONTEXT_DIR: "{{ app_name }}"
 postgresql:
+  DATABASE_SERVICE_NAME: sonardb
   POSTGRESQL_DATABASE: sonar
   VOLUME_CAPACITY: 5
   POSTGRESQL_PASSWORD: sonar
   POSTGRESQL_USER: sonar
 deploy:
   POSTGRES_DATABASE_NAME: "{{ postgresql.POSTGRESQL_DATABASE }}"
 
-
 openshift_cluster_content:
 - object: Environment Setup
   content:
@@ -49,4 +49,4 @@ openshift_cluster_content:
     namespace: "{{ namespace }}"
     tags:
     - deploy
-    - deploy-postgresql
+    - deploy-postgresql
diff --git a/sonarqube/.openshift/templates/sonarqube-deployment-template.yml b/sonarqube/.openshift/templates/sonarqube-deployment-template.yml
@@ -4,10 +4,10 @@ metadata:
   name: "sonarqube"
 objects:
 - apiVersion: v1
+  kind: Secret
   stringData:
     password: ${SONAR_LDAP_BIND_PASSWORD}
     username: ${SONAR_LDAP_BIND_DN}
-  kind: Secret
   metadata:
     name: sonar-ldap-bind-dn
   type: kubernetes.io/basic-auth
@@ -271,4 +271,4 @@ parameters:
   - name: SONAR_LDAP_CONTEXTFACTORY
     description: The ContextFactory implementation to be used when communicating with the LDAP server
     displayName: LDAP Context Factory
-    value: com.sun.jndi.ldap.LdapCtxFactory
+    value: com.sun.jndi.ldap.LdapCtxFactory