diff --git a/ansible/playbooks/group_vars/postgresql.yml b/ansible/playbooks/group_vars/postgresql.yml index ffdad50f..dfbc17da 100644 --- a/ansible/playbooks/group_vars/postgresql.yml +++ b/ansible/playbooks/group_vars/postgresql.yml @@ -3,11 +3,11 @@ namespace_postgresql: "{{ project_name }}" postgresql_init_scripts: - - https://raw.githubusercontent.com/NAPS-emergency-response-project/sql-scripts/master/naps_emergency_response_ddl.sql + - https://raw.githubusercontent.com/NAPS-emergency-response-project/sql-scripts/summit/naps_emergency_response_ddl.sql postgresql_username: naps postgresql_password: naps postgresql_database: naps_emergency_response postgresql_application_name: postgresql -postgresql_credentials_secret: "{{ postgresql_application_name }}-credentials" \ No newline at end of file +postgresql_credentials_secret: "{{ postgresql_application_name }}-credentials" diff --git a/ansible/playbooks/group_vars/services.yml b/ansible/playbooks/group_vars/services.yml index 84495f62..879b7ef8 100644 --- a/ansible/playbooks/group_vars/services.yml +++ b/ansible/playbooks/group_vars/services.yml @@ -16,17 +16,46 @@ incident_priority_service_application_name: incident-priority-service disaster_simulator_service_application_name: disaster-simulator incident_service_git_repo: https://github.com/NAPS-emergency-response-project/incident-service.git +incident_service_git_branch: summit-checkpoint + responder_simulator_service_git_repo: https://github.com/NAPS-emergency-response-project/responder-simulator.git +responder_simulator_service_git_branch: summit-checkpoint + responder_service_git_repo: https://github.com/NAPS-emergency-response-project/responder-service.git +responder_service_git_branch: summit-checkpoint + incident_process_git_repo: https://github.com/NAPS-emergency-response-project/incident-process-kjar.git +incident_process_git_branch: summit-checkpoint + assignment_rules_git_repo: https://github.com/NAPS-emergency-response-project/cajun-navy-rules.git +assignment_rules_git_branch: summit-checkpoint + assignment_rules_model_git_repo: https://github.com/NAPS-emergency-response-project/cajun-navy-rules-model.git +assignment_rules_model_git_branch: summit-checkpoint + process_service_git_repo: https://github.com/NAPS-emergency-response-project/process-service.git +process_service_git_branch: summit-checkpoint + mission_service_git_repo: https://github.com/NAPS-emergency-response-project/mission-service.git +mission_service_git_branch: summit-checkpoint + emergency_console_git_repo: https://github.com/NAPS-emergency-response-project/emergency-console.git +emergency_console_git_branch: summit-checkpoint + process_viewer_git_repo: https://github.com/NAPS-emergency-response-project/process-viewer.git +process_viewer_git_repo: summit-checkpoint + incident_priority_service_git_repo: https://github.com/NAPS-emergency-response-project/incident-priority-service.git +incident_priority_service_git_branch: summit-checkpoint + disaster_simulator_service_git_repo: https://github.com/NAPS-emergency-response-project/disaster-simulator.git +disaster_simulator_service_git_branch: summit-checkpoint + +process_viewer_git_repo: https://github.com/NAPS-emergency-response-project/process-viewer.git +process_viewer_git_branch: summit-checkpoint + +sso_theme_git_repo: https://github.com/NAPS-emergency-response-project/emergency-sso +sso_theme_git_branch: summit-checkpoint process_service_postgresql_username: rhpam process_service_postgresql_password: rhpam diff --git a/ansible/resources/assignment-rules-model/assignment-rules-model-pipeline.yml b/ansible/resources/assignment-rules-model/assignment-rules-model-pipeline.yml index 0be8a441..4b7d76cc 100644 --- a/ansible/resources/assignment-rules-model/assignment-rules-model-pipeline.yml +++ b/ansible/resources/assignment-rules-model/assignment-rules-model-pipeline.yml @@ -11,6 +11,7 @@ spec: jenkinsPipelineStrategy: jenkinsfile: |- def git_repo = "{{ assignment_rules_model_git_repo }}" + def git_branch = "{{ assignment_rules_model_git_branch }}" def version = "" def groupId = "" def artifactId = "" @@ -21,7 +22,7 @@ spec: node ('maven-with-nexus') { stage ('Compile') { echo "Starting build" - git url: "${git_repo}", branch: "master" + git url: "${git_repo}", branch: "${git_branch}" def pom = readMavenPom file: 'pom.xml' version = pom.version groupId = pom.groupId @@ -42,9 +43,9 @@ spec: stage ('Publish to Nexus') { echo "adding server settings to ~/.m2/settings.xml" - def xml=" releases" + - "deploymentdeployment123" + - "snapshots" + + def xml=" releases" + + "deploymentdeployment123" + + "snapshots" + "deploymentdeployment123" + "" sh "sed -i 's|||' /home/jenkins/.m2/settings.xml" @@ -59,7 +60,7 @@ spec: sh "mvn deploy -DskipTests=true -Dcom.redhat.xpaas.repo.redhatga=true -DaltDeploymentRepository=releases::default::${nexusUrl}/content/repositories/releases" } } - } + } type: JenkinsPipeline triggers: - github: @@ -67,4 +68,4 @@ spec: type: GitHub - generic: secret: {{ generic_secret }} - type: Generic \ No newline at end of file + type: Generic diff --git a/ansible/resources/assignment-rules/assignment-rules-pipeline.yml b/ansible/resources/assignment-rules/assignment-rules-pipeline.yml index 0cd95a1a..315400f1 100644 --- a/ansible/resources/assignment-rules/assignment-rules-pipeline.yml +++ b/ansible/resources/assignment-rules/assignment-rules-pipeline.yml @@ -11,6 +11,7 @@ spec: jenkinsPipelineStrategy: jenkinsfile: |- def git_repo = "{{ assignment_rules_git_repo }}" + def git_branch = "{{ assignment_rules_git_branch }}" def version = "" def groupId = "" def artifactId = "" @@ -21,7 +22,7 @@ spec: node ('maven-with-nexus') { stage ('Compile') { echo "Starting build" - git url: "${git_repo}", branch: "master" + git url: "${git_repo}", branch: "${git_branch}" def pom = readMavenPom file: 'pom.xml' version = pom.version groupId = pom.groupId @@ -42,9 +43,9 @@ spec: stage ('Publish to Nexus') { echo "adding server settings to ~/.m2/settings.xml" - def xml=" releases" + - "deploymentdeployment123" + - "snapshots" + + def xml=" releases" + + "deploymentdeployment123" + + "snapshots" + "deploymentdeployment123" + "" sh "sed -i 's|||' /home/jenkins/.m2/settings.xml" @@ -59,7 +60,7 @@ spec: sh "mvn deploy -DskipTests=true -Dcom.redhat.xpaas.repo.redhatga=true -DaltDeploymentRepository=releases::${nexusUrl}/content/repositories/releases" } } - } + } type: JenkinsPipeline triggers: - github: @@ -67,4 +68,4 @@ spec: type: GitHub - generic: secret: {{ generic_secret }} - type: Generic \ No newline at end of file + type: Generic diff --git a/ansible/resources/disaster-simulator-service/disaster-simulator-service-pipeline.yml b/ansible/resources/disaster-simulator-service/disaster-simulator-service-pipeline.yml index 6d2a1fa0..879afb3a 100644 --- a/ansible/resources/disaster-simulator-service/disaster-simulator-service-pipeline.yml +++ b/ansible/resources/disaster-simulator-service/disaster-simulator-service-pipeline.yml @@ -11,6 +11,7 @@ spec: jenkinsPipelineStrategy: jenkinsfile: |- def git_repo = "{{ disaster_simulator_service_git_repo }}" + def git_branch = "{{ disaster_simulator_service_git_branch }}" def version = "" def groupId = "" def artifactId = "" @@ -24,7 +25,7 @@ spec: node ('maven-with-nexus') { stage ('Compile') { echo "Starting build" - git url: "${git_repo}", branch: "master" + git url: "${git_repo}", branch: "${git_branch}" def pom = readMavenPom file: 'pom.xml' version = pom.version groupId = pom.groupId diff --git a/ansible/resources/emergency-console/emergency-console-pipeline.yml b/ansible/resources/emergency-console/emergency-console-pipeline.yml index 24690f65..cc33de4b 100644 --- a/ansible/resources/emergency-console/emergency-console-pipeline.yml +++ b/ansible/resources/emergency-console/emergency-console-pipeline.yml @@ -11,6 +11,7 @@ spec: jenkinsPipelineStrategy: jenkinsfile: |- def git_repo = "{{ incident_service_git_repo }}" + def git_branch = "{{ incident_service_git_branch }}" def namespace_jenkins = "{{ namespace_tools }}" def namespace_app = "{{ namespace }}" def app_build = "{{ buildconfig_name }}" @@ -33,14 +34,14 @@ spec: } builds.untilEach(1) { return it.object().status.phase == "Complete" - } + } } } } stage ('Deploy') { openshift.withCluster() { - openshift.withProject( "${namespace_app}") { + openshift.withProject( "${namespace_app}") { openshift.tag("${namespace_jenkins}/${app_imagestream}:latest", "${namespace_app}/${app_imagestream}:latest") def dc_app = openshift.selector("dc", "${app_name}") timeout (5) { @@ -48,10 +49,10 @@ spec: return it.object().status.readyReplicas == 1 } } - } + } } } - } + } type: JenkinsPipeline triggers: - github: @@ -59,4 +60,4 @@ spec: type: GitHub - generic: secret: {{ generic_secret }} - type: Generic \ No newline at end of file + type: Generic diff --git a/ansible/resources/incident-priority-service/incident-priority-service-pipeline.yml b/ansible/resources/incident-priority-service/incident-priority-service-pipeline.yml index 73fa553a..c7c12208 100644 --- a/ansible/resources/incident-priority-service/incident-priority-service-pipeline.yml +++ b/ansible/resources/incident-priority-service/incident-priority-service-pipeline.yml @@ -11,6 +11,7 @@ spec: jenkinsPipelineStrategy: jenkinsfile: |- def git_repo = "{{ incident_priority_service_git_repo }}" + def git_branch = "{{ incident_priority_service_git_branch }}" def version = "" def groupId = "" def artifactId = "" @@ -24,7 +25,7 @@ spec: node ('maven-with-nexus') { stage ('Compile') { echo "Starting build" - git url: "${git_repo}", branch: "master" + git url: "${git_repo}", branch: "${git_branch}" def pom = readMavenPom file: 'pom.xml' version = pom.version groupId = pom.groupId @@ -62,14 +63,14 @@ spec: } builds.untilEach(1) { return it.object().status.phase == "Complete" - } + } } } } stage ('Deploy') { openshift.withCluster() { - openshift.withProject( "${namespace_app}") { + openshift.withProject( "${namespace_app}") { openshift.tag("${namespace_jenkins}/${app_imagestream}:latest", "${namespace_app}/${app_imagestream}:latest") openshift.tag("${namespace_jenkins}/${app_imagestream}:latest", "${namespace_jenkins}/${app_imagestream}:${commitId}") openshift.tag("${namespace_app}/${app_imagestream}:latest", "${namespace_app}/${app_imagestream}:${commitId}") @@ -79,10 +80,10 @@ spec: return it.object().status.readyReplicas == 1 } } - } + } } } - } + } type: JenkinsPipeline triggers: - github: @@ -90,4 +91,4 @@ spec: type: GitHub - generic: secret: {{ generic_secret }} - type: Generic \ No newline at end of file + type: Generic diff --git a/ansible/resources/incident-process/incident-process-pipeline.yml b/ansible/resources/incident-process/incident-process-pipeline.yml index 615bf45c..2ec3d240 100644 --- a/ansible/resources/incident-process/incident-process-pipeline.yml +++ b/ansible/resources/incident-process/incident-process-pipeline.yml @@ -11,6 +11,7 @@ spec: jenkinsPipelineStrategy: jenkinsfile: |- def git_repo = "{{ incident_process_git_repo }}" + def git_branch = "{{ incident_process_git_branch }}" def version = "" def groupId = "" def artifactId = "" @@ -21,7 +22,7 @@ spec: node ('maven-with-nexus') { stage ('Compile') { echo "Starting build" - git url: "${git_repo}", branch: "master" + git url: "${git_repo}", branch: "${git_branch}" def pom = readMavenPom file: 'pom.xml' version = pom.version groupId = pom.groupId @@ -38,9 +39,9 @@ spec: stage ('Publish to Nexus') { echo "adding server settings to ~/.m2/settings.xml" - def xml=" releases" + - "deploymentdeployment123" + - "snapshots" + + def xml=" releases" + + "deploymentdeployment123" + + "snapshots" + "deploymentdeployment123" + "" sh "sed -i 's|||' /home/jenkins/.m2/settings.xml" @@ -55,7 +56,7 @@ spec: sh "mvn deploy -DskipTests=true -Dcom.redhat.xpaas.repo.redhatga=true -DaltDeploymentRepository=releases::${nexusUrl}/content/repositories/releases" } } - } + } type: JenkinsPipeline triggers: - github: @@ -63,4 +64,4 @@ spec: type: GitHub - generic: secret: {{ generic_secret }} - type: Generic \ No newline at end of file + type: Generic diff --git a/ansible/resources/incident-service/incident-service-pipeline.yml b/ansible/resources/incident-service/incident-service-pipeline.yml index 217776f1..55f49556 100644 --- a/ansible/resources/incident-service/incident-service-pipeline.yml +++ b/ansible/resources/incident-service/incident-service-pipeline.yml @@ -11,6 +11,7 @@ spec: jenkinsPipelineStrategy: jenkinsfile: |- def git_repo = "{{ incident_service_git_repo }}" + def git_branch = "{{ incident_service_git_branch }}" def version = "" def groupId = "" def artifactId = "" @@ -24,7 +25,7 @@ spec: node ('maven-with-nexus') { stage ('Compile') { echo "Starting build" - git url: "${git_repo}", branch: "master" + git url: "${git_repo}", branch: "${git_branch}" def pom = readMavenPom file: 'pom.xml' version = pom.version groupId = pom.groupId @@ -62,14 +63,14 @@ spec: } builds.untilEach(1) { return it.object().status.phase == "Complete" - } + } } } } stage ('Deploy') { openshift.withCluster() { - openshift.withProject( "${namespace_app}") { + openshift.withProject( "${namespace_app}") { openshift.tag("${namespace_jenkins}/${app_imagestream}:latest", "${namespace_app}/${app_imagestream}:latest") openshift.tag("${namespace_jenkins}/${app_imagestream}:latest", "${namespace_jenkins}/${app_imagestream}:${commitId}") openshift.tag("${namespace_app}/${app_imagestream}:latest", "${namespace_app}/${app_imagestream}:${commitId}") @@ -79,10 +80,10 @@ spec: return it.object().status.readyReplicas == 1 } } - } + } } } - } + } type: JenkinsPipeline triggers: - github: @@ -90,4 +91,4 @@ spec: type: GitHub - generic: secret: {{ generic_secret }} - type: Generic \ No newline at end of file + type: Generic diff --git a/ansible/resources/mission-service/mission-service-pipeline.yml b/ansible/resources/mission-service/mission-service-pipeline.yml index b2bfc989..5ead9e4e 100644 --- a/ansible/resources/mission-service/mission-service-pipeline.yml +++ b/ansible/resources/mission-service/mission-service-pipeline.yml @@ -11,6 +11,7 @@ spec: jenkinsPipelineStrategy: jenkinsfile: |- def git_repo = "{{ mission_service_git_repo }}" + def git_branch = "{{ mission_service_git_branch }}" def version = "" def groupId = "" def artifactId = "" @@ -24,7 +25,7 @@ spec: node ('maven-with-nexus') { stage ('Compile') { echo "Starting build" - git url: "${git_repo}", branch: "master" + git url: "${git_repo}", branch: "${git_branch}" def pom = readMavenPom file: 'pom.xml' version = pom.version groupId = pom.groupId @@ -62,14 +63,14 @@ spec: } builds.untilEach(1) { return it.object().status.phase == "Complete" - } + } } } } stage ('Deploy') { openshift.withCluster() { - openshift.withProject( "${namespace_app}") { + openshift.withProject( "${namespace_app}") { openshift.tag("${namespace_jenkins}/${app_imagestream}:latest", "${namespace_app}/${app_imagestream}:latest") openshift.tag("${namespace_jenkins}/${app_imagestream}:latest", "${namespace_jenkins}/${app_imagestream}:${commitId}") openshift.tag("${namespace_app}/${app_imagestream}:latest", "${namespace_app}/${app_imagestream}:${commitId}") @@ -79,10 +80,10 @@ spec: return it.object().status.readyReplicas == 1 } } - } + } } } - } + } type: JenkinsPipeline triggers: - github: @@ -90,4 +91,4 @@ spec: type: GitHub - generic: secret: {{ generic_secret }} - type: Generic \ No newline at end of file + type: Generic diff --git a/ansible/resources/process-service/process-service-pipeline.yml b/ansible/resources/process-service/process-service-pipeline.yml index 7b718069..c3a9243c 100644 --- a/ansible/resources/process-service/process-service-pipeline.yml +++ b/ansible/resources/process-service/process-service-pipeline.yml @@ -11,6 +11,7 @@ spec: jenkinsPipelineStrategy: jenkinsfile: |- def git_repo = "{{ process_service_git_repo }}" + def git_branch = "{{ process_service_git_branch }}" def version = "" def groupId = "" def artifactId = "" @@ -24,7 +25,7 @@ spec: node ('maven-with-nexus') { stage ('Compile') { echo "Starting build" - git url: "${git_repo}", branch: "master" + git url: "${git_repo}", branch: "${git_branch}" def pom = readMavenPom file: 'pom.xml' version = pom.version groupId = pom.groupId diff --git a/ansible/resources/process-viewer/process-viewer-pipeline.yml b/ansible/resources/process-viewer/process-viewer-pipeline.yml index 02206929..555ff6b2 100644 --- a/ansible/resources/process-viewer/process-viewer-pipeline.yml +++ b/ansible/resources/process-viewer/process-viewer-pipeline.yml @@ -11,6 +11,7 @@ spec: jenkinsPipelineStrategy: jenkinsfile: |- def git_repo = "{{ process_viewer_git_repo }}" + def git_branch = "{{ process_viewer_git_branch }}" def version = "" def groupId = "" def artifactId = "" @@ -24,7 +25,7 @@ spec: node ('maven-with-nexus') { stage ('Compile') { echo "Starting build" - git url: "${git_repo}", branch: "master" + git url: "${git_repo}", branch: "${git_branch}" def pom = readMavenPom file: 'pom.xml' version = pom.version groupId = pom.groupId @@ -62,14 +63,14 @@ spec: } builds.untilEach(1) { return it.object().status.phase == "Complete" - } + } } } } stage ('Deploy') { openshift.withCluster() { - openshift.withProject( "${namespace_app}") { + openshift.withProject( "${namespace_app}") { openshift.tag("${namespace_jenkins}/${app_imagestream}:latest", "${namespace_app}/${app_imagestream}:latest") openshift.tag("${namespace_jenkins}/${app_imagestream}:latest", "${namespace_jenkins}/${app_imagestream}:${commitId}") openshift.tag("${namespace_app}/${app_imagestream}:latest", "${namespace_app}/${app_imagestream}:${commitId}") @@ -79,10 +80,10 @@ spec: return it.object().status.readyReplicas == 1 } } - } + } } } - } + } type: JenkinsPipeline triggers: - github: @@ -90,4 +91,4 @@ spec: type: GitHub - generic: secret: {{ generic_secret }} - type: Generic \ No newline at end of file + type: Generic diff --git a/ansible/resources/responder-service/responder-service-pipeline.yml b/ansible/resources/responder-service/responder-service-pipeline.yml index 94a251e2..f7b4e58a 100644 --- a/ansible/resources/responder-service/responder-service-pipeline.yml +++ b/ansible/resources/responder-service/responder-service-pipeline.yml @@ -11,6 +11,7 @@ spec: jenkinsPipelineStrategy: jenkinsfile: |- def git_repo = "{{ responder_service_git_repo }}" + def git_branch = "{{ responder_service_git_branch }}" def version = "" def groupId = "" def artifactId = "" @@ -24,7 +25,7 @@ spec: node ('maven-with-nexus') { stage ('Compile') { echo "Starting build" - git url: "${git_repo}", branch: "master" + git url: "${git_repo}", branch: "${git_branch}" def pom = readMavenPom file: 'pom.xml' version = pom.version groupId = pom.groupId @@ -62,14 +63,14 @@ spec: } builds.untilEach(1) { return it.object().status.phase == "Complete" - } + } } } } stage ('Deploy') { openshift.withCluster() { - openshift.withProject( "${namespace_app}") { + openshift.withProject( "${namespace_app}") { openshift.tag("${namespace_jenkins}/${app_imagestream}:latest", "${namespace_app}/${app_imagestream}:latest") openshift.tag("${namespace_jenkins}/${app_imagestream}:latest", "${namespace_jenkins}/${app_imagestream}:${commitId}") openshift.tag("${namespace_app}/${app_imagestream}:latest", "${namespace_app}/${app_imagestream}:${commitId}") @@ -79,10 +80,10 @@ spec: return it.object().status.readyReplicas == 1 } } - } + } } } - } + } type: JenkinsPipeline triggers: - github: @@ -90,4 +91,4 @@ spec: type: GitHub - generic: secret: {{ generic_secret }} - type: Generic \ No newline at end of file + type: Generic diff --git a/ansible/resources/responder-simulator-service/responder-simulator-service-pipeline.yml b/ansible/resources/responder-simulator-service/responder-simulator-service-pipeline.yml index f99fa730..d4a90287 100644 --- a/ansible/resources/responder-simulator-service/responder-simulator-service-pipeline.yml +++ b/ansible/resources/responder-simulator-service/responder-simulator-service-pipeline.yml @@ -11,6 +11,7 @@ spec: jenkinsPipelineStrategy: jenkinsfile: |- def git_repo = "{{ responder_simulator_service_git_repo }}" + def git_branch = "{{ responder_simulator_service_git_branch }}" def version = "" def groupId = "" def artifactId = "" @@ -24,7 +25,7 @@ spec: node ('maven-with-nexus') { stage ('Compile') { echo "Starting build" - git url: "${git_repo}", branch: "master" + git url: "${git_repo}", branch: "${git_branch}" def pom = readMavenPom file: 'pom.xml' version = pom.version groupId = pom.groupId diff --git a/ansible/resources/sso/theme-buildconfig.yml b/ansible/resources/sso/theme-buildconfig.yml index 9bd7485f..f178083d 100644 --- a/ansible/resources/sso/theme-buildconfig.yml +++ b/ansible/resources/sso/theme-buildconfig.yml @@ -17,6 +17,7 @@ spec: source: git: uri: '{{ theme_build_source }}' + ref: '{{ theme_build_source_ref }}' type: Git strategy: sourceStrategy: diff --git a/ansible/roles/openshift_emergency_console/defaults/main.yml b/ansible/roles/openshift_emergency_console/defaults/main.yml index bb818568..ad208bd9 100644 --- a/ansible/roles/openshift_emergency_console/defaults/main.yml +++ b/ansible/roles/openshift_emergency_console/defaults/main.yml @@ -19,7 +19,7 @@ imagestream_template: emergency-console-imagestream.yml application_template: emergency-console.yml git_url: "{{ emergency_console_git_repo }}" -git_ref: master +git_ref: "{{ emergency_console_git_branch }}" emergency_console_config_configmap: emergency-console-config rhsso_config_configmap: "{{ sso_config_configmap }}" diff --git a/ansible/roles/openshift_incident_priority_service/defaults/main.yml b/ansible/roles/openshift_incident_priority_service/defaults/main.yml index abe4add5..f354db12 100644 --- a/ansible/roles/openshift_incident_priority_service/defaults/main.yml +++ b/ansible/roles/openshift_incident_priority_service/defaults/main.yml @@ -9,8 +9,8 @@ logging_configmap: incident-priority-service-logging application_properties: application-config.yaml -git_url: https://github.com/NAPS-emergency-response-project/incident-priority-service.git -git_ref: master +git_url: "{{ incident_priority_service_git_repo }}" +git_ref: "{{ incident_priority_service_git_branch }}" application_image: redhat-openjdk18-openshift:1.4 application_image_namespace: openshift @@ -36,4 +36,4 @@ kafka_incident_assignment_event_topic: topic-incident-event logging_style: dev prometheus_endpoint_path: "/metrics" -prometheus_endpoint_port: 8080 \ No newline at end of file +prometheus_endpoint_port: 8080 diff --git a/ansible/roles/openshift_incident_service/defaults/main.yml b/ansible/roles/openshift_incident_service/defaults/main.yml index 0729fd3c..283fac6c 100644 --- a/ansible/roles/openshift_incident_service/defaults/main.yml +++ b/ansible/roles/openshift_incident_service/defaults/main.yml @@ -9,8 +9,8 @@ logging_configmap: incident-service-logging application_properties: application.properties -git_url: https://github.com/NAPS-emergency-response-project/incident-service.git -git_ref: master +git_url: "{{ incident_service_git_repo }}" +git_ref: "{{ incident_service_git_branch }}" application_image: redhat-openjdk18-openshift:1.4 application_image_namespace: openshift @@ -40,4 +40,4 @@ narayana_pool_max_total: 20 logging_style: dev prometheus_endpoint_path: "/actuator/prometheus" -prometheus_endpoint_port: 8080 \ No newline at end of file +prometheus_endpoint_port: 8080 diff --git a/ansible/roles/openshift_responder_service/defaults/main.yml b/ansible/roles/openshift_responder_service/defaults/main.yml index b406a1ee..030f12f0 100644 --- a/ansible/roles/openshift_responder_service/defaults/main.yml +++ b/ansible/roles/openshift_responder_service/defaults/main.yml @@ -9,8 +9,8 @@ logging_configmap: responder-service-logging application_properties: application.properties -git_url: https://github.com/NAPS-emergency-response-project/responder-service.git -git_ref: master +git_url: "{{ responder_service_git_repo }}" +git_ref: "{{ responder_service_git_branch }}" application_image: redhat-openjdk18-openshift:1.4 application_image_namespace: openshift @@ -40,4 +40,4 @@ kafka_responder_event_topic: topic-responder-event logging_style: dev prometheus_endpoint_path: "/actuator/prometheus" -prometheus_endpoint_port: 8080 \ No newline at end of file +prometheus_endpoint_port: 8080 diff --git a/ansible/roles/openshift_sso/defaults/main.yml b/ansible/roles/openshift_sso/defaults/main.yml index 5a30dbd2..5152ba81 100644 --- a/ansible/roles/openshift_sso/defaults/main.yml +++ b/ansible/roles/openshift_sso/defaults/main.yml @@ -7,7 +7,8 @@ theme_build_imagestream_template: "{{ resources_dir }}/theme-imagestream.yml" theme_build_image: redhat-sso73-openshift-theme theme_build_image_tag: 1.0 -theme_build_source: https://github.com/NAPS-emergency-response-project/emergency-sso +theme_build_source: "{{ sso_theme_git_repo }}" +theme_build_source_ref: "{{ sso_theme_git_branch }}" theme_build_imagestream: redhat-sso73-openshift theme_build_imagestream_tag: 1.0 @@ -36,4 +37,4 @@ postgresql_shared_buffers: 32MB postgresql_pv_capacity: 1Gi sso_realm_id: emergency-realm -sso_realm_template: "{{ resources_dir }}/realm.json" \ No newline at end of file +sso_realm_template: "{{ resources_dir }}/realm.json"