Merge pull request #245 from garethahealy/sonarqube-webhook

Added jenkins url param for webhook

sonarqube/.applier/group_vars/seed-hosts.yml

@@ -1,5 +1,6 @@
 namespace: sonarqube
 app_name: sonarqube
+jenkins_url: http://jenkins:80
 
 build:
   NAME: "{{ app_name }}"
@@ -14,6 +15,7 @@ postgresql:
   POSTGRESQL_USER: sonar
 deploy:
   POSTGRES_DATABASE_NAME: "{{ postgresql.POSTGRESQL_DATABASE }}"
+  JENKINS_URL: "{{ jenkins_url }}"
 
 openshift_cluster_content:
 - object: Environment Setup

sonarqube/.openshift/templates/sonarqube-deployment-template.yml

@@ -44,7 +44,7 @@ objects:
             - /bin/sh
             - -c
             - sleep 30 && curl http://admin:admin@sonarqube:9000/api/webhooks/create
-              -X POST -d "name=jenkins&url=http://jenkins/sonarqube-webhook/"
+              -X POST -d "name=jenkins&url=${JENKINS_URL}/sonarqube-webhook/"
             containerName: sonarqube
           failurePolicy: Abort
       type: Recreate
@@ -197,9 +197,6 @@ objects:
       deploymentconfig: sonarqube
     sessionAffinity: None
     type: ClusterIP
-  status:
-    loadBalancer: {}
-  status: {}
 parameters:
   - description: Database name for the Posgres Database to be used by Sonarqube
     displayName: Postgres database name
@@ -272,3 +269,7 @@ parameters:
     description: The ContextFactory implementation to be used when communicating with the LDAP server
     displayName: LDAP Context Factory
     value: com.sun.jndi.ldap.LdapCtxFactory
+  - name: JENKINS_URL
+    description: The Jenkins URL used for the webhook
+    displayName: Jenkins URL
+    value: http://jenkins