From 3fe97db68c371e95a1c6b0023d8667ee9749aa29 Mon Sep 17 00:00:00 2001 From: Marcus Gillitzer Date: Thu, 7 May 2020 10:53:47 +0200 Subject: [PATCH 1/6] Korrektur fuer git eingebaut und qs Umgebung eingebaut --- group_vars/qs.yml | 14 ++++++++++++++ qs/hosts | 17 +++++++++++++++++ roles/ams_0008_8.0.8.0/tasks/main.yml | 26 +++++++++++++------------- roles/base_installation/tasks/main.yml | 9 +++++++++ roles/git/tasks/main.yml | 9 +++++++++ site.retry | 2 +- site.yml | 21 ++++++++++++++++++++- 7 files changed, 83 insertions(+), 15 deletions(-) create mode 100644 group_vars/qs.yml create mode 100644 qs/hosts diff --git a/group_vars/qs.yml b/group_vars/qs.yml new file mode 100644 index 0000000..3d4e539 --- /dev/null +++ b/group_vars/qs.yml @@ -0,0 +1,14 @@ +--- +#aus /templates/pwd_Appserver.xml.j2 + /templates/pwd_ServiceIMP.xml.j2 + +## hier ist noch die DB der AMSE eingetragen, da die DBAler noch +## keine DB zum Zeitpunkt deeer Installation hatten 20200507 GI. + ams_DatabaseIPAdress: amse-vip.tpolizei-bw.de + ams_DatabasePort: 1531 + ams_DatabaseServiceName: AMSE + ams_DatabaseName: AMS Entwicklung + ams_LogLevel: DEBUG + + sso_host: "Host *.TPOLIZEI-BW.DE" + sso_domain_upper: "TPOLIZEI-BW.DE" + sso_domain_lower: "tpolizei-bw.de" diff --git a/qs/hosts b/qs/hosts new file mode 100644 index 0000000..e3ba2a9 --- /dev/null +++ b/qs/hosts @@ -0,0 +1,17 @@ +# This is the default ansible 'hosts' file. +# +# It should live in /etc/ansible/hosts +# +# - Comments begin with the '#' character +# - Blank lines are ignored +# - Groups of hosts are delimited by [header] elements +# - You can enter hostnames or ip addresses +# - A hostname/ip can be a member of multiple groups + +# Ex 1: Ungrouped hosts, specify before any group headers. + +[qs] +80.155.206.80 + + + diff --git a/roles/ams_0008_8.0.8.0/tasks/main.yml b/roles/ams_0008_8.0.8.0/tasks/main.yml index 19d18fe..80ae795 100644 --- a/roles/ams_0008_8.0.8.0/tasks/main.yml +++ b/roles/ams_0008_8.0.8.0/tasks/main.yml @@ -123,19 +123,19 @@ state: absent - name: commit changes to git shell: | - git rm ams /linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_ASSERVAT.xml - git rm ams /linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_BERICHT.xml - git rm ams /linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_BETEILIGTE_STELLE.xml - git rm ams /linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_FARBANGABE.xml - git rm ams /linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_KATALOG_CODE226.xml - git rm ams /linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_KATALOG_CODE295.xml - git rm ams /linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_KFZ_KENNZEICHENINFORMATION.xml - git rm ams /linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_MATERIAL.xml - git rm ams /linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_MERKMAL.xml - git rm ams /linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_NUMMERNANGABE_BEI_FAHRZEUGEN.xml - git rm ams /linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_PLZORT.xml - git rm ams /linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_TAETOWIERUNG.xml - git rm ams /linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_ZULASSUNGSINFO_WFZ.xml + git rm ams/linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_ASSERVAT.xml + git rm ams/linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_BERICHT.xml + git rm ams/linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_BETEILIGTE_STELLE.xml + git rm ams/linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_FARBANGABE.xml + git rm ams/linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_KATALOG_CODE226.xml + git rm ams/linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_KATALOG_CODE295.xml + git rm ams/linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_KFZ_KENNZEICHENINFORMATION.xml + git rm ams/linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_MATERIAL.xml + git rm ams/linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_MERKMAL.xml + git rm ams/linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_NUMMERNANGABE_BEI_FAHRZEUGEN.xml + git rm ams/linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_PLZORT.xml + git rm ams/linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_TAETOWIERUNG.xml + git rm ams/linux/Services/plugins/rola/com.rola.rsframe.project.ams/com/rola/rscase/configfiles/gui/statedependentcols/SDCC_ZULASSUNGSINFO_WFZ.xml git add . git -c user.name='Ansible Playbook' -c user.email='ansible@playbook' commit -m "ams_0008_8.0.8.0" exit 0 diff --git a/roles/base_installation/tasks/main.yml b/roles/base_installation/tasks/main.yml index 7a62141..9997b9c 100644 --- a/roles/base_installation/tasks/main.yml +++ b/roles/base_installation/tasks/main.yml @@ -6,6 +6,15 @@ owner: jetty group: dba mode: '0644' + - name: Create a directory /opt/rola if it does not exist + become: yes + become_user: root + file: + path: /opt/rola + state: directory + mode: '0755' + owner: jetty + group: dba - name: Create a directory /opt/tmp if it does not exist become: yes become_user: root diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml index b61b476..5db16a4 100644 --- a/roles/git/tasks/main.yml +++ b/roles/git/tasks/main.yml @@ -14,9 +14,18 @@ owner: jetty group: dba mode: '0644' + + - name: check if /opt/rola/.git exists + shell: ls -ld /opt/rola/.git + register: result + ignore_errors: true + - name: Initialisiere leeres Repo innerhalb von /opt/rola command: git init /opt/rola/ + when: result.stdout == '' + + # Mehr habe ich nicht gemacht, # git add . diff --git a/site.retry b/site.retry index 777c1c1..3fd0fc0 100644 --- a/site.retry +++ b/site.retry @@ -1 +1 @@ -80.155.206.72 +80.155.206.80 diff --git a/site.yml b/site.yml index 3d1f6dc..45f6e98 100644 --- a/site.yml +++ b/site.yml @@ -11,12 +11,29 @@ become: yes roles: - #- base_installation + #- base_installation + #- git #- ams_0008_8.0.8.0 #- ams_sso #- ams_0008_8.0.8.0_AdminServer #- ams_0013_8.0.9.0 + +########################################################## +######### QS ############## +########################################################## +- name: Installation für QS-Umgebung + hosts: qs + become_user: jetty + become: yes + + roles: + #- base_installation + - git + #- ams_0008_8.0.8.0 + #- ams_sso + - ams_0008_8.0.8.0_AdminServer + - ams_0013_8.0.9.0 @@ -30,6 +47,7 @@ roles: - base_installation + #- git - git - ams_0008_8.0.8.0 @@ -46,6 +64,7 @@ roles: - base_installation + #- git - git - ams_0008_8.0.8.0 From 556a1f5cf5672401fa49fef2b20a4af5a4b3ea92 Mon Sep 17 00:00:00 2001 From: Marcus Gillitzer Date: Tue, 12 May 2020 14:04:00 +0200 Subject: [PATCH 2/6] Einbau neuer VIP-Adresse Datenbank AMSQS --- group_vars/qs.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/group_vars/qs.yml b/group_vars/qs.yml index 3d4e539..2d67e82 100644 --- a/group_vars/qs.yml +++ b/group_vars/qs.yml @@ -3,12 +3,18 @@ ## hier ist noch die DB der AMSE eingetragen, da die DBAler noch ## keine DB zum Zeitpunkt deeer Installation hatten 20200507 GI. - ams_DatabaseIPAdress: amse-vip.tpolizei-bw.de - ams_DatabasePort: 1531 - ams_DatabaseServiceName: AMSE - ams_DatabaseName: AMS Entwicklung + ams_DatabaseIPAdress: vip-amsqs.tpolizei-bw.de + ams_DatabasePort: 1532 + ams_DatabaseServiceName: AMSQS + ams_DatabaseName: AMS QS ams_LogLevel: DEBUG sso_host: "Host *.TPOLIZEI-BW.DE" sso_domain_upper: "TPOLIZEI-BW.DE" sso_domain_lower: "tpolizei-bw.de" + + + + + + From af45db42dde58f6aa481ca3ebd8aab91a69efbf4 Mon Sep 17 00:00:00 2001 From: Marcus Gillitzer Date: Wed, 13 May 2020 15:48:03 +0200 Subject: [PATCH 3/6] git init neu eingebaut --- roles/git/tasks/main.yml | 16 +++++++++------- site.yml | 6 ++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml index 5db16a4..77f39cb 100644 --- a/roles/git/tasks/main.yml +++ b/roles/git/tasks/main.yml @@ -20,18 +20,20 @@ register: result ignore_errors: true + - debug: + msg: "{{ result }}" - name: Initialisiere leeres Repo innerhalb von /opt/rola command: git init /opt/rola/ when: result.stdout == '' - - -# Mehr habe ich nicht gemacht, -# git add . -# git commit -# habe ich händisch ausgeführt - + - name: commit changes to git + shell: | + git add . + git -c user.name='Ansible Playbook' -c user.email='ansible@playbook' commit -m "Initialisiere_Basis_AMS" + exit 0 + args: + chdir: "/opt/rola" diff --git a/site.yml b/site.yml index 45f6e98..42b66aa 100644 --- a/site.yml +++ b/site.yml @@ -29,10 +29,10 @@ roles: #- base_installation - - git + #- git #- ams_0008_8.0.8.0 #- ams_sso - - ams_0008_8.0.8.0_AdminServer + #- ams_0008_8.0.8.0_AdminServer - ams_0013_8.0.9.0 @@ -47,7 +47,6 @@ roles: - base_installation - #- git - git - ams_0008_8.0.8.0 @@ -64,7 +63,6 @@ roles: - base_installation - #- git - git - ams_0008_8.0.8.0 From 861fc283efffbd916f292c208c99c6c70c299634 Mon Sep 17 00:00:00 2001 From: Marcus Gillitzer Date: Wed, 13 May 2020 16:13:25 +0200 Subject: [PATCH 4/6] =?UTF-8?q?Default-Variablen=20f=C3=BCr=20git=20eingeb?= =?UTF-8?q?aut=20f=C3=BCr=20modulare=20Benutztung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/git/README.md | 18 ++++++++++++++---- roles/git/defaults/main.yml | 5 ++++- roles/git/tasks/main.yml | 18 +++++++++--------- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/roles/git/README.md b/roles/git/README.md index efebd1c..8a33243 100644 --- a/roles/git/README.md +++ b/roles/git/README.md @@ -2,10 +2,12 @@ Role Name ========= 1. Installiert git auf dem System. -2. Kopiert .gitignore nach /opt/rola +2. Kopiert .gitignore nach {{ path_init }} 3. Initiiert ein Git-Repository -Aber: git add . + git commit fehlt noch!!!!!!!!!!!!!!!!!!!!!!!! +Aktuell wird beim prüfen, ob schon ein .git-Ordner vorhanden ist noch ein Fehler geworfen wenn der Ordner NICHT da ist, aber +der Fehler wird dann übersprungen. +Vielleicht gibt es noch eine bessere Lösung? Requirements @@ -16,7 +18,12 @@ RHEL 7, x86-64 Role Variables -------------- -Keine. +Folgende Variablen sind im Default-Ordner vorhanden: + + +path_init="/opt/rola" +user_name="jetty" +user_group="dba" Dependencies @@ -33,6 +40,9 @@ Including an example of how to use your role (for instance, with variables passe - hosts: all roles: - git + path_init: "/opt/oracle" + user_name: "wls2" + user_group: "dba" License ------- @@ -42,4 +52,4 @@ BSD Author Information ------------------ -Marcus Gillitzer Version 0.1 +Marcus Gillitzer Version 0.2 diff --git a/roles/git/defaults/main.yml b/roles/git/defaults/main.yml index 4db8f11..2c33318 100644 --- a/roles/git/defaults/main.yml +++ b/roles/git/defaults/main.yml @@ -1,2 +1,5 @@ --- -# defaults file for default_role \ No newline at end of file +# defaults file for default_role +path_init="/opt/rola" +user_name="jetty" +user_group="dba" diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml index 77f39cb..6253f2a 100644 --- a/roles/git/tasks/main.yml +++ b/roles/git/tasks/main.yml @@ -10,30 +10,30 @@ - name: Copy file .gitignore with owner and permissions copy: src: ./files/.gitignore - dest: /opt/rola/.gitignore - owner: jetty - group: dba + dest: {{ path_init }}/.gitignore + owner: {{ user_name }} + group: {{ user_group }} mode: '0644' - - name: check if /opt/rola/.git exists - shell: ls -ld /opt/rola/.git + - name: check if {{ path_init }}/.git exists + shell: ls -ld {{ path_init }}/.git register: result ignore_errors: true - debug: msg: "{{ result }}" - - name: Initialisiere leeres Repo innerhalb von /opt/rola - command: git init /opt/rola/ + - name: Initialisiere leeres Repo innerhalb von {{ path_init }} + command: git init {{ path_init }}/ when: result.stdout == '' - name: commit changes to git shell: | git add . - git -c user.name='Ansible Playbook' -c user.email='ansible@playbook' commit -m "Initialisiere_Basis_AMS" + git -c user.name='{{ user_name }} Playbook' -c user.email='{{ user_name }}@playbook' commit -m "Initialisiere GIT" exit 0 args: - chdir: "/opt/rola" + chdir: "{{ path_init }}" From 92472f913eb380205a0a89fbc6efa01d0f77c40a Mon Sep 17 00:00:00 2001 From: Marcus Gillitzer Date: Tue, 19 May 2020 08:31:39 +0200 Subject: [PATCH 5/6] Neue vip-Adresse Development eingepflegt --- group_vars/development.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/development.yml b/group_vars/development.yml index ef2d3c3..8ed6c80 100644 --- a/group_vars/development.yml +++ b/group_vars/development.yml @@ -1,6 +1,6 @@ --- #aus /templates/pwd_Appserver.xml.j2 + /templates/pwd_ServiceIMP.xml.j2 - ams_DatabaseIPAdress: amse-vip.tpolizei-bw.de + ams_DatabaseIPAdress: vip-amse.tpolizei-bw.de ams_DatabasePort: 1531 ams_DatabaseServiceName: AMSE ams_DatabaseName: AMS Entwicklung From f7299785d9459e1323c5c9d09b6102a11ad4a02f Mon Sep 17 00:00:00 2001 From: Marcus Gillitzer Date: Tue, 19 May 2020 11:11:29 +0200 Subject: [PATCH 6/6] Syntax-Fehler im Bereich roles/git behoben --- roles/git/defaults/main.yml | 6 +++--- roles/git/files/{.gitignore => gitignore} | 0 roles/git/tasks/main.yml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) rename roles/git/files/{.gitignore => gitignore} (100%) diff --git a/roles/git/defaults/main.yml b/roles/git/defaults/main.yml index 2c33318..ef32bc1 100644 --- a/roles/git/defaults/main.yml +++ b/roles/git/defaults/main.yml @@ -1,5 +1,5 @@ --- # defaults file for default_role -path_init="/opt/rola" -user_name="jetty" -user_group="dba" +path_init: "/opt/rola" +user_name: "jetty" +user_group: "dba" diff --git a/roles/git/files/.gitignore b/roles/git/files/gitignore similarity index 100% rename from roles/git/files/.gitignore rename to roles/git/files/gitignore diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml index 6253f2a..1ae4fc8 100644 --- a/roles/git/tasks/main.yml +++ b/roles/git/tasks/main.yml @@ -9,10 +9,10 @@ - name: Copy file .gitignore with owner and permissions copy: - src: ./files/.gitignore - dest: {{ path_init }}/.gitignore - owner: {{ user_name }} - group: {{ user_group }} + src: ./files/gitignore + dest: "{{ path_init }}/.gitignore" + owner: "{{ user_name }}" + group: "{{ user_group }}" mode: '0644' - name: check if {{ path_init }}/.git exists