From 3fe97db68c371e95a1c6b0023d8667ee9749aa29 Mon Sep 17 00:00:00 2001 From: Marcus Gillitzer Date: Thu, 7 May 2020 10:53:47 +0200 Subject: [PATCH] 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