diff --git a/sonarqube/.applier/group_vars/seed-hosts.yml b/sonarqube/.applier/group_vars/seed-hosts.yml index 4991e1c2b..3b2abf55b 100644 --- a/sonarqube/.applier/group_vars/seed-hosts.yml +++ b/sonarqube/.applier/group_vars/seed-hosts.yml @@ -7,6 +7,7 @@ build: SOURCE_REPOSITORY_REF: master SOURCE_CONTEXT_DIR: "{{ app_name }}" postgresql: + DATABASE_SERVICE_NAME: sonardb POSTGRESQL_DATABASE: sonar VOLUME_CAPACITY: 5 POSTGRESQL_PASSWORD: sonar @@ -14,7 +15,6 @@ postgresql: 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 \ No newline at end of file + - deploy-postgresql diff --git a/sonarqube/.openshift/templates/sonarqube-deployment-template.yml b/sonarqube/.openshift/templates/sonarqube-deployment-template.yml index cddf3b50f..388519ebc 100644 --- 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 \ No newline at end of file + value: com.sun.jndi.ldap.LdapCtxFactory