From b691447e27c7f6200ced533961983394fe4791ac Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Wed, 5 May 2021 12:54:32 +0200 Subject: [PATCH] feat: provisioning for docker registry --- host_vars/dev-connect-03.yml | 15 --------------- host_vars/dev-connect-04.yml | 15 --------------- host_vars/dev-docker-registry-01.yml | 5 +++++ host_vars/dev-elastic-stack-01.yml | 5 ----- host_vars/dev-elastic-stack-02.yml | 5 ----- host_vars/dev-elastic-stack-03.yml | 5 ----- roles/common/tasks/main.yml | 5 +++++ setup.yml | 5 ----- stage-dev | 2 -- 9 files changed, 10 insertions(+), 52 deletions(-) delete mode 100644 host_vars/dev-connect-03.yml delete mode 100644 host_vars/dev-connect-04.yml create mode 100644 host_vars/dev-docker-registry-01.yml diff --git a/host_vars/dev-connect-03.yml b/host_vars/dev-connect-03.yml deleted file mode 100644 index d987475..0000000 --- a/host_vars/dev-connect-03.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- - -hetzner_server_labels: "stage={{ stage }} service=connect" - -connect_auth_module: oidc -connect_oidc_client_id: connect-03 -connect_oidc_client_secret: 9e234965-1041-4653-8a0e-db964c04bc26 -connect_oidc_registration_id: connect-03 -connect_oidc_issuer_uri: https://{{ keycloak_hostname }}/auth/realms/smardigo-01 - -connect_password_change_url: https://{{ keycloak_hostname }}/auth/realms/smardigo-01/account/password -connect_iam_user_management_url: https://{{ keycloak_hostname }}/auth/admin/smardigo-01/console - -spring_profiles_include_suffix: ",hetzner" -ribbon_display_on_active_profiles: "hetzner" diff --git a/host_vars/dev-connect-04.yml b/host_vars/dev-connect-04.yml deleted file mode 100644 index 7a2d8c0..0000000 --- a/host_vars/dev-connect-04.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- - -hetzner_server_labels: "stage={{ stage }} service=connect" - -connect_auth_module: oidc -connect_oidc_client_id: connect-04 -connect_oidc_client_secret: 9e234965-1041-4653-8a0e-db964c04bc26 -connect_oidc_registration_id: connect-04 -connect_oidc_issuer_uri: https://{{ keycloak_hostname }}/auth/realms/smardigo-01 - -connect_password_change_url: https://{{ keycloak_hostname }}/auth/realms/smardigo-01/account/password -connect_iam_user_management_url: https://{{ keycloak_hostname }}/auth/admin/smardigo-01/console - -spring_profiles_include_suffix: ",hetzner" -ribbon_display_on_active_profiles: "hetzner" diff --git a/host_vars/dev-docker-registry-01.yml b/host_vars/dev-docker-registry-01.yml new file mode 100644 index 0000000..10a60d8 --- /dev/null +++ b/host_vars/dev-docker-registry-01.yml @@ -0,0 +1,5 @@ +--- + +hetzner_server_labels: "stage={{ stage }} service=docker" + +hetzner_server_type: cpx31 diff --git a/host_vars/dev-elastic-stack-01.yml b/host_vars/dev-elastic-stack-01.yml index 6725ae2..ff06f50 100644 --- a/host_vars/dev-elastic-stack-01.yml +++ b/host_vars/dev-elastic-stack-01.yml @@ -4,11 +4,6 @@ hetzner_server_labels: "stage={{ stage }} service=elastic" hetzner_server_type: cx31 -hetzner_ssh_keys: - - stefan@curow.de - - sven.ketelsen@arxes-tolina.de - smardigo_plattform_users: - 'elastic' - - 'stefan.curow' - 'sven.ketelsen' diff --git a/host_vars/dev-elastic-stack-02.yml b/host_vars/dev-elastic-stack-02.yml index 6725ae2..ff06f50 100644 --- a/host_vars/dev-elastic-stack-02.yml +++ b/host_vars/dev-elastic-stack-02.yml @@ -4,11 +4,6 @@ hetzner_server_labels: "stage={{ stage }} service=elastic" hetzner_server_type: cx31 -hetzner_ssh_keys: - - stefan@curow.de - - sven.ketelsen@arxes-tolina.de - smardigo_plattform_users: - 'elastic' - - 'stefan.curow' - 'sven.ketelsen' diff --git a/host_vars/dev-elastic-stack-03.yml b/host_vars/dev-elastic-stack-03.yml index 6725ae2..ff06f50 100644 --- a/host_vars/dev-elastic-stack-03.yml +++ b/host_vars/dev-elastic-stack-03.yml @@ -4,11 +4,6 @@ hetzner_server_labels: "stage={{ stage }} service=elastic" hetzner_server_type: cx31 -hetzner_ssh_keys: - - stefan@curow.de - - sven.ketelsen@arxes-tolina.de - smardigo_plattform_users: - 'elastic' - - 'stefan.curow' - 'sven.ketelsen' diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index f8cd507..56dcd1d 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -173,6 +173,11 @@ tags: - config +- name: "Check docker networks" + include_role: + name: _docker + tasks_from: networks + - name: sshd configuration file update template: src: 'configs/sshd/sshd_config.j2' diff --git a/setup.yml b/setup.yml index c3f5f31..4ff581a 100644 --- a/setup.yml +++ b/setup.yml @@ -55,11 +55,6 @@ var: stage_server_ip delegate_to: 127.0.0.1 - - name: "Check docker networks" - include_role: - name: _docker - tasks_from: networks - roles: - role: ansible-role-docker vars: diff --git a/stage-dev b/stage-dev index ba359b9..765ed33 100644 --- a/stage-dev +++ b/stage-dev @@ -1,8 +1,6 @@ [connect] dev-connect-01 dev-connect-02 -dev-connect-03 -dev-connect-04 [docker_registry] dev-docker-registry-01