diff --git a/group_vars/all/versions.yml b/group_vars/all/versions.yml index 5215f82..2a0e770 100644 --- a/group_vars/all/versions.yml +++ b/group_vars/all/versions.yml @@ -23,9 +23,9 @@ prom_prom2teams_version: "3.2.3" # TODO 4.2.1 traefik_version: "v2.10.3" -connect_version: "10.5" -iam_version: "10.5" -process_search_version: "1.3" +connect_version: "11.1" +iam_version: "11.1" +process_search_version: "1.4" wordpress_image_version: "6.3" ansible_minimal_version: "2.12.0" diff --git a/group_vars/stage_demompmx/database.yml b/group_vars/stage_demompmx/database.yml index c8db6e2..df6ab70 100644 --- a/group_vars/stage_demompmx/database.yml +++ b/group_vars/stage_demompmx/database.yml @@ -1,7 +1,8 @@ --- stage_database_management_connect_name: "{{ stage }}_infrastructure_management_connect" stage_database_management_connect_password: "connect-postgres-admin" - +stage_database_management_process_search_name: "{{ stage }}_infrastructure_management_process_search" +stage_database_management_process_search_password: "connect-postgres-admin" stage_database_management_keycloak_name: "{{ stage }}_infrastructure_management_keycloak" stage_database_management_keycloak_password: "keycloak-postgres-admin" stage_database_management_gitea_name: "{{ stage }}_infrastructure_management_gitea" @@ -11,6 +12,9 @@ stage_postgres_acls: - name: "{{ stage_database_management_connect_name }}" password: "{{ stage_database_management_connect_password }}" trusted_cidr_entry: "{{ shared_service_network }}" + - name: "{{ stage_database_management_process_search_name }}" + password: "{{ stage_database_management_process_search_password }}" + trusted_cidr_entry: "{{ shared_service_network }}" - name: "{{ stage_database_management_keycloak_name }}" password: "{{ stage_database_management_keycloak_password }}" trusted_cidr_entry: "{{ shared_service_network }}" diff --git a/group_vars/stage_devnso/database.yml b/group_vars/stage_devnso/database.yml index 8e115f1..86e10d7 100644 --- a/group_vars/stage_devnso/database.yml +++ b/group_vars/stage_devnso/database.yml @@ -1,6 +1,8 @@ --- stage_database_management_connect_name: "{{ stage }}_management_smardigo_connect" stage_database_management_connect_password: "connect-postgres-admin" +stage_database_management_process_search_name: "{{ stage }}_management_smardigo_process_search" +stage_database_management_process_search_password: "connect-postgres-admin" stage_database_management_keycloak_name: "{{ stage }}_keycloak" stage_database_management_keycloak_password: "keycloak-postgres-admin" stage_database_management_gitea_name: "{{ stage }}_gitea" @@ -10,6 +12,9 @@ stage_postgres_acls: - name: "{{ stage_database_management_connect_name }}" password: "{{ stage_database_management_connect_password }}" trusted_cidr_entry: "{{ shared_service_network }}" + - name: "{{ stage_database_management_process_search_name }}" + password: "{{ stage_database_management_process_search_password }}" + trusted_cidr_entry: "{{ shared_service_network }}" - name: "{{ stage_database_management_keycloak_name }}" password: "{{ stage_database_management_keycloak_password }}" trusted_cidr_entry: "{{ shared_service_network }}" diff --git a/group_vars/stage_prodnso/database.yml b/group_vars/stage_prodnso/database.yml index 4808b43..f9a6606 100644 --- a/group_vars/stage_prodnso/database.yml +++ b/group_vars/stage_prodnso/database.yml @@ -4,6 +4,8 @@ shared_service_postgres_secondary: "{{ stage }}-postgres-02" stage_database_management_connect_name: "{{ stage }}_management_smardigo_connect" stage_database_management_connect_password: "connect-postgres-admin" +stage_database_management_process_search_name: "{{ stage }}_management_smardigo_process_search" +stage_database_management_process_search_password: "connect-postgres-admin" stage_database_management_keycloak_name: "{{ stage }}_keycloak" stage_database_management_keycloak_password: "keycloak-postgres-admin" stage_database_management_gitea_name: "{{ stage }}_gitea" @@ -13,6 +15,9 @@ stage_postgres_acls: - name: "{{ stage_database_management_connect_name }}" password: "{{ stage_database_management_connect_password }}" trusted_cidr_entry: "{{ shared_service_network }}" + - name: "{{ stage_database_management_process_search_name }}" + password: "{{ stage_database_management_process_search_password }}" + trusted_cidr_entry: "{{ shared_service_network }}" - name: "{{ stage_database_management_keycloak_name }}" password: "{{ stage_database_management_keycloak_password }}" trusted_cidr_entry: "{{ shared_service_network }}" diff --git a/group_vars/stage_qanso/database.yml b/group_vars/stage_qanso/database.yml index 8e115f1..86e10d7 100644 --- a/group_vars/stage_qanso/database.yml +++ b/group_vars/stage_qanso/database.yml @@ -1,6 +1,8 @@ --- stage_database_management_connect_name: "{{ stage }}_management_smardigo_connect" stage_database_management_connect_password: "connect-postgres-admin" +stage_database_management_process_search_name: "{{ stage }}_management_smardigo_process_search" +stage_database_management_process_search_password: "connect-postgres-admin" stage_database_management_keycloak_name: "{{ stage }}_keycloak" stage_database_management_keycloak_password: "keycloak-postgres-admin" stage_database_management_gitea_name: "{{ stage }}_gitea" @@ -10,6 +12,9 @@ stage_postgres_acls: - name: "{{ stage_database_management_connect_name }}" password: "{{ stage_database_management_connect_password }}" trusted_cidr_entry: "{{ shared_service_network }}" + - name: "{{ stage_database_management_process_search_name }}" + password: "{{ stage_database_management_process_search_password }}" + trusted_cidr_entry: "{{ shared_service_network }}" - name: "{{ stage_database_management_keycloak_name }}" password: "{{ stage_database_management_keycloak_password }}" trusted_cidr_entry: "{{ shared_service_network }}" diff --git a/initialize-stage.yml b/initialize-stage.yml index 6a4f987..b8e937b 100644 --- a/initialize-stage.yml +++ b/initialize-stage.yml @@ -14,11 +14,11 @@ ### update_configurations (connect) ############################################################# -# Setup stage default databases (postgres) +# Setup stage default databases (postgres01) ############################################################# -- name: 'apply setup to {{ host | default("postgres") }}' - hosts: '{{ host | default("postgres") }}' +- name: 'apply setup to {{ host | default("postgres01") }}' + hosts: '{{ host | default("postgres01") }}' serial: "{{ serial_number | default(5) }}" become: true vars: diff --git a/roles/harbor_config/defaults/main.yml b/roles/harbor_config/defaults/main.yml index ffeac39..1c02d46 100644 --- a/roles/harbor_config/defaults/main.yml +++ b/roles/harbor_config/defaults/main.yml @@ -23,7 +23,8 @@ harbor_system_configuration: harbor_project_names: - awx - - sken + - smardigo + - smardigo-helm - infrastructure # default configuration for all harbor projects diff --git a/roles/management/tasks/main.yaml b/roles/management/tasks/main.yaml index f39eab8..fdcbe39 100644 --- a/roles/management/tasks/main.yaml +++ b/roles/management/tasks/main.yaml @@ -30,6 +30,7 @@ cluster_name: "{{ management_oidc_client_id }}" connect_oidc_client_secret: "{{ management_oidc_client_secret }}" connect_postgres_database: "{{ stage_database_management_connect_name }}" + process_search_postgres_database: "{{ stage_database_management_process_search_name }}" connect_config_delete_scope_enabled: true connect_datasource_action_enabled: true connect_element_template_enabled: true diff --git a/scripts/update-docker-image.sh b/scripts/update-docker-image.sh index 464ca08..4d62e13 100755 --- a/scripts/update-docker-image.sh +++ b/scripts/update-docker-image.sh @@ -5,7 +5,7 @@ # update-docker-image.sh devnso smardigo smardigo keycloak 12.0.4.2 # update-docker-image.sh qanso smardigo smardigo connect-whitelabel-app latest -FROM="docker.dev-at.de/$2/$4:$5" +FROM="prodnso-harbor-01.smardigo.digital/$2/$4:$5" TO="$1-harbor-01.smardigo.digital/$3/$4:$5" echo