first part cleanup and better handling of /etc/hosts files

Author: BeckerFrank

org.eclipse.mylyn.releng/multipass/README.md

@@ -88,10 +88,10 @@ You will get certification warnings and must trust the self signed certificate.
 If you want to access the URLs from an other computer in your local environment you must add a line to your /etc/hosts file.
 Look into /etc/hosts of your installation host computer and you see the following line
 ```
-192.168.64.3 mylynmstr01 mylyn.local traefik.mylyn.local jenkins.mylyn.local hello.mylyn.local artifactory.mylyn.local gitlab.mylyn.local
+192.168.64.3 mylynmstr01 mylyn.local traefik.mylyn.local jenkins.mylyn.local artifactory.mylyn.local gitlab.mylyn.local
 ```
 copy this line and replace the IP adress with the local network IP address assinged to the mylynmstr01 vm
 ```
-192.168.2.120 mylynmstr01 mylyn.local traefik.mylyn.local jenkins.mylyn.local hello.mylyn.local artifactory.mylyn.local gitlab.mylyn.local
+192.168.2.120 mylynmstr01 mylyn.local traefik.mylyn.local jenkins.mylyn.local artifactory.mylyn.local gitlab.mylyn.local
 ```
 Now you shold be able to assess the URLs from the other computer

org.eclipse.mylyn.releng/multipass/create_vm.yml

@@ -4,6 +4,9 @@
 - hosts: localhost
   gather_facts: true
   pre_tasks:
+    - file:
+        path: mylyn_vars
+        state: absent
     - file:
         path: mylyn_vars
         state: directory
@@ -12,7 +15,7 @@
       copy:
         force: true
         dest: "mylyn_vars/{{ inventory_hostname }}.json"
-        content: "{{ vars | dict2items | json_query('[?starts_with(key, `inst_`)]') | items2dict }}"
+        content: "{{ vars | dict2items | json_query('[?starts_with(key, `mylyn_`)]') | items2dict }}"
   tasks:
     - name: include global mode
       ansible.builtin.include_tasks:
@@ -33,7 +36,7 @@
       delegate_to: localhost
       copy:
         dest: "mylyn_vars/{{ inventory_hostname }}.json"
-        content: "{{ vars | dict2items | json_query('[?starts_with(key, `inst_`)]') | items2dict }}"
+        content: "{{ vars | dict2items | json_query('[?starts_with(key, `mylyn_`)]') | items2dict }}"
   roles:
     - role: multipass_create_vm
       tags:
@@ -57,29 +60,29 @@
       delegate_to: localhost
       copy:
         dest: "mylyn_vars/{{ inventory_hostname }}.json"
-        content: "{{ vars | dict2items | json_query('[?starts_with(key, `inst_`)]') | items2dict }}"
+        content: "{{ vars | dict2items | json_query('[?starts_with(key, `mylyn_`)]') | items2dict }}"
   vars:
     rootca_name: "{{ hostvars['localhost'].rootca_server_name }}"
   roles:
     - role: crtrootca
       vars:
-        common_domain_name: "{{ hostvars['localhost'].local_domain }}"
+        common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
       tags:
         - createValidCertificates
         - base_software
     - role: crtcertificate
       vars:
         subject_alt: 
-          - "DNS:*.{{ hostvars['localhost'].local_domain }}"
-        common_domain_name: "{{ hostvars['localhost'].local_domain }}"
+          - "DNS:*.{{ hostvars['localhost'].mylyn_service_domain }}"
+        common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
       tags:
         - createValidCertificates
         - base_software
 
 #
 # create Certificates for amm non Admin Nodes
 #
-- hosts: "{{ hostvars['localhost'].setup_noadmin_vm_list }}"
+- hosts: "{{ hostvars['localhost'].mylyn_noadmin_vm_hosts }}"
   gather_facts: true
   vars:
     rootca_name: "{{ hostvars['localhost'].rootca_server_name }}"
@@ -90,7 +93,7 @@
         - base_software
       vars:
         subject_alt: "{{ hostvars[inventory_hostname].default_etc_hosts.split() | map('regex_replace', '^', 'DNS:') | list }}"
-        common_domain_name: "{{ hostvars['localhost'].local_domain }}"
+        common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
     - role: dockerhost
       tags:
         - base_software
@@ -122,7 +125,7 @@
         - base_software
       delegate_to: "{{ item }}"
       with_items: 
-        -  "{{ hostvars['localhost'].setup_noadmin_vm_list }}"
+        -  "{{ hostvars['localhost'].mylyn_noadmin_vm_hosts }}"
 
 #
 # Copy rootca to local and crete cacerts with our rootca

org.eclipse.mylyn.releng/multipass/global_setup.yml

@@ -1,19 +1,18 @@
     - name: set global var
       ansible.builtin.set_fact:
         grp_prefix: "{{ prefix | default('mylyn')}}"
-        local_domain: "{{ local_dom | default('mylyn.local')}}"
-        remote_domain: "{{ remote_dom | default('public.mydomain.de')}}"
+        mylyn_service_domain: "{{ local_domain | default('mylyn.local')}}"
         docker_swarm_recreate: "{{ swarm_recreate | default(false) }}"
         docker_mode_global: "{{ docker_run_mode | default('container') }}"
-        network_ip_matcher: "{{ local_network_ip_matcher | default('^192\\.168\\.2\\..*') }}"
+        network_ip_matcher: "{{ local_network_ip_matcher | default('^192\\.168\\.64\\..*') }}"
       tags:
         - global
 
     - name: build list 1
       ansible.builtin.set_fact:
         setup_lst_tmp: 
          "{{ groups[grp_prefix + \"_admin\"]  + groups[grp_prefix + \"_swarm_master\"] }}" 
-        setup_noadmin_vm_list: 
+        mylyn_noadmin_vm_hosts: 
          "{{ groups[grp_prefix + \"_swarm_master\"] }}" 
       tags:
         - global
@@ -22,32 +21,32 @@
       ansible.builtin.set_fact:
         setup_lst_tmp:  
          "{{ setup_lst_tmp  +  groups[grp_prefix + \"_swarm_worker\" ] }}"
-        setup_noadmin_vm_list: 
-         "{{ setup_noadmin_vm_list  +  groups[grp_prefix + \"_swarm_worker\" ] }}"
+        mylyn_noadmin_vm_hosts: 
+         "{{ mylyn_noadmin_vm_hosts  +  groups[grp_prefix + \"_swarm_worker\" ] }}"
       tags:
         - global
       when: (docker_mode_global == 'swarm' or docker_mode_global == 'all')
     - name: set list admin server
       ansible.builtin.set_fact:
         rootca_server_name: "{{ groups[hostvars['localhost'].grp_prefix + \"_admin\"][0] }}"
-        prim_install_server_name: "{{ groups[hostvars['localhost'].grp_prefix + \"_swarm_master\"][0] }}"
+        mylyn_service_vm_name: "{{ groups[hostvars['localhost'].grp_prefix + \"_swarm_master\"][0] }}"
       tags:
         - global
     - name: build single
       ansible.builtin.set_fact:
         setup_lst_tmp:  
          "{{ groups[grp_prefix + \"_swarm_master\" ] }}"
-        setup_noadmin_vm_list: 
+        mylyn_noadmin_vm_hosts: 
          "{{ groups[grp_prefix + \"_swarm_master\" ] }}"
         rootca_server_name:
-         "{{ prim_install_server_name }}"
+         "{{ mylyn_service_vm_name }}"
       tags:
         - global
       when: (docker_mode_global == 'single')
 
-    - name: build setup_lst
+    - name: build mylyn_vm_hosts
       ansible.builtin.set_fact:
-        setup_lst: "{{ setup_lst | default([]) + [ { 'name': item, 'ip4': hostvars[item].ansible_host, 'disk':  hostvars[item].multipass_disk, 'memory':  hostvars[item].multipass_memory, 'cpus':  hostvars[item].multipass_cpus, 'launch_extra': hostvars[item].additional_launch_parms } ] }}"
+        mylyn_vm_hosts: "{{ mylyn_vm_hosts | default([]) + [ { 'name': item, 'ip4': hostvars[item].ansible_host, 'disk':  hostvars[item].multipass_disk, 'memory':  hostvars[item].multipass_memory, 'cpus':  hostvars[item].multipass_cpus, 'launch_extra': hostvars[item].additional_launch_parms } ] }}"
       with_items:
         - "{{ setup_lst_tmp }}"
       tags:
@@ -64,9 +63,11 @@
       vars:
          msg: |
              rootca_server_name = {{ rootca_server_name }}
-             localhostPlatform = {{ localhostPlatform }}
-             all hosts = {{ setup_lst }}
-             all non admin vm = {{ setup_noadmin_vm_list }}
+             localhostPlatform  = {{ localhostPlatform }}
+             all hosts          = {{ mylyn_vm_hosts }}
+             all non admin vm   = {{ mylyn_noadmin_vm_hosts }}
+             service vm         = {{ mylyn_service_vm_name }}
+             service domain     = {{ mylyn_service_domain }}
       ansible.builtin.debug:
         msg: "{{ msg.split('\n') }}"
         verbosity: 0

org.eclipse.mylyn.releng/multipass/inventory.yml

@@ -15,7 +15,8 @@ all:
         multipass_disk: 30G
         multipass_memory: 10G
         multipass_cpus: 4
-#       only needed when you want to share your instance to other devices in Network or Internet		
+#       only needed when you want to share your instance to other devices in Network or Internet
+#       en0 is valid for for mac os with apple silicon		
         additional_launch_parms: '--network=en0'
     mylyn_swarm_worker:
       hosts:
@@ -38,7 +39,7 @@ all:
       ansible_user: ubuntu
       ansible_ssh_common_args: "-o StrictHostKeyChecking=no -o ControlMaster=no -o ControlPath=none"
       ansible_ssh_private_key_file: first_setup/ubuntu_key
-      default_etc_hosts: "mylynmstr01 mylyn.local traefik.mylyn.local jenkins.mylyn.local hello.mylyn.local artifactory.mylyn.local gitlab.mylyn.local"
+      default_etc_hosts: "mylynmstr01 mylyn.local traefik.mylyn.local jenkins.mylyn.local artifactory.mylyn.local gitlab.mylyn.local"
     mylynwrk01:
       ansible_connection: ssh
       ansible_host: "192.168.64.4"

org.eclipse.mylyn.releng/multipass/mylyn_setup.yml

@@ -3,6 +3,11 @@
 #
 - hosts: localhost
   gather_facts: true
+  pre_tasks:
+    - include_vars:
+        dir: mylyn_vars
+        extensions:
+        - json
   tasks:
     - name: include global mode
       ansible.builtin.include_tasks:
@@ -16,8 +21,13 @@
 #
 # start all non admin Docker Nodes
 #
-- hosts: "{{ hostvars['localhost'].setup_noadmin_vm_list }}"
+- hosts: "{{ hostvars['localhost'].mylyn_noadmin_vm_hosts }}"
   gather_facts: true
+  pre_tasks:
+    - include_vars:
+        dir: mylyn_vars
+        extensions:
+        - json
   vars:
     rootca_name: "{{ hostvars['localhost'].rootca_server_name }}"
   tasks:
@@ -29,14 +39,22 @@
     - name: debug distribution
       debug:
         msg: "{{ ansible_facts['distribution'] +'/' + ansible_facts['architecture'] + ' on ' + hostvars['localhost'].localhostPlatform }}"
+    - name: debug mylyn_service_domain
+      debug:
+        msg: "{{ hostvars['localhost'].mylyn_service_domain }}"
 #
 # 1) install Docker Swarm Leader (if needed)
 # 2) stop all Docker Services / Container
 #
-- hosts: "{{ hostvars['localhost'].prim_install_server_name }}"
+- hosts: "{{ hostvars['localhost'].mylyn_service_vm_name }}"
   gather_facts: false
+  pre_tasks:
+    - include_vars:
+        dir: mylyn_vars
+        extensions:
+        - json
   vars:
-    swarm_master_name: "{{ hostvars['localhost'].prim_install_server_name  }}"
+    swarm_master_name: "{{ hostvars['localhost'].mylyn_service_vm_name  }}"
   roles:
     - role: swarm_delete
       when: ((hostvars['localhost'].docker_swarm_recreate | bool == true) or (hostvars['localhost'].docker_mode_global == "container"))
@@ -51,8 +69,13 @@
 #
 # cleanup all docker instances 
 #
-- hosts: "{{ hostvars['localhost'].setup_noadmin_vm_list }}"
+- hosts: "{{ hostvars['localhost'].mylyn_noadmin_vm_hosts }}"
   gather_facts: true
+  pre_tasks:
+    - include_vars:
+        dir: mylyn_vars
+        extensions:
+        - json
   vars:
     rootca_name: "{{ hostvars['localhost'].rootca_server_name }}"
   roles:
@@ -63,44 +86,41 @@
 # Services installieren
 # install Docker Services / Container
 # 
-- hosts: "{{ hostvars['localhost'].prim_install_server_name  }}"
+- hosts: "{{ hostvars['localhost'].mylyn_service_vm_name  }}"
   gather_facts: false
   pre_tasks:
     - include_vars:
         dir: mylyn_vars
         extensions:
         - json
   vars:
-    swarm_master_name: "{{ hostvars['localhost'].prim_install_server_name  }}"
+    swarm_master_name: "{{ hostvars['localhost'].mylyn_service_vm_name  }}"
     docker_mode: "{{ hostvars['localhost'].docker_mode_global }}"
   roles:
     - role: traeefik
       vars:
-        common_domain_name: "{{ hostvars['localhost'].local_domain }}"
+        common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
     - role: socket-proxy
     - role: mylyn_idx
       vars:
-        common_domain_name: "{{ hostvars['localhost'].local_domain }}"
-        remote_domain_name: "{{ hostvars['localhost'].remote_domain }}"
+        common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
     - role: artifactory
       tags:
         - artifactory
       vars:
-        common_domain_name: "{{ hostvars['localhost'].local_domain }}"
-#        remote_domain_name: "{{ hostvars['localhost'].remote_domain }}"
+        common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
     - role: gitlab
       tags:
         - gitlab
       vars:
-        common_domain_name: "{{ hostvars['localhost'].local_domain }}"
+        common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
         gitlabImageVersion: "16.11.1"
-        gitlabHostURL: "gitlab.{{ hostvars['localhost'].local_domain }}"
+        gitlabHostURL: "gitlab.{{ hostvars['localhost'].mylyn_service_domain }}"
     - role: jenkins
       tags:
         - jenkins
       vars:
-        common_domain_name: "{{ hostvars['localhost'].local_domain }}"
-        remote_domain_name: "{{ hostvars['localhost'].remote_domain }}"
+        common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
         jenkins_instances:
 #          - {  servmame: "jenkins-2_303_3", port1: 8081, port2: 50001, data_dir: "jenkins-2.303.3", image_tag: "jenkins/jenkins:2.303.3-lts-jdk11", extra_info: '' }
 #          - {  servmame: "jenkins-1_651_1", port1: 8084, port2: 50004, data_dir: "jenkins-2.303.3", image_tag: "jenkins:1.651.1", extra_info: '"' }
@@ -110,13 +130,12 @@
       tags:
         - bugzilla
       vars:
-        common_domain_name: "{{ hostvars['localhost'].local_domain }}"
-        remote_domain_name: "{{ hostvars['localhost'].remote_domain }}"
+        common_domain_name: "{{ hostvars['localhost'].mylyn_service_domain }}"
         bugzilla_instances:
           - { git_branch: "release-4.4.13", servmame: "bugzilla-4_4", port1: 8090, port2: 8490, image_tag: "4.4", extra_info: '"default": "true"' }
 #          - { git_branch: "release-4.4.13", servmame: "bugzilla-4_4-custom-wf", port1: 8091, port2: 8491, image_tag: "4.4-custom_wf", extra_info: '"custom_wf":"true"' }
 #          - { git_branch: "release-4.4.13", servmame: "bugzilla-4_4-custom-wf-and-status", port1: 8092, port2: 8492, image_tag: "4.4-custom_wf_a_s", extra_info: '"custom_wf_and_status":"true"' }
 #          - { git_branch: "release-4.4.13", servmame: "bugzilla-4_4-bugaliases", port1: 8093, port2: 8493, image_tag: "4.4-bugaliases", extra_info: '"use_bug_alias":"true"' }
 #          - { git_branch: "5.2", servmame: "bugzilla-5_2", port1: 8094, port2: 8494, image_tag: "5.2", extra_info: '' }
-#          - { git_branch: "5.2", servmame: "bugzilla-5_2-rest", port1: 8095, port2: 8495, image_tag: "5.2-rest", extra_info: '"rest_enabled":"true", "default": "true", "testdataVersion": "Version1"' }
-#          - { git_branch: "5.2", servmame: "bugzilla-5_2-rest-api", port1: 8096, port2: 8496, image_tag: "5.2-rest-api", extra_info: '"rest_enabled": "true", "api_key_enabled": "true", "testdataVersion": "Version1"' }
+          - { git_branch: "5.2", servmame: "bugzilla-5_2-rest", port1: 8095, port2: 8495, image_tag: "5.2-rest", extra_info: '"rest_enabled":"true", "default": "true", "testdataVersion": "Version1"' }
+          - { git_branch: "5.2", servmame: "bugzilla-5_2-rest-api", port1: 8096, port2: 8496, image_tag: "5.2-rest-api", extra_info: '"rest_enabled": "true", "api_key_enabled": "true", "testdataVersion": "Version1"' }

org.eclipse.mylyn.releng/multipass/roles/artifactory/files/system.yaml

@@ -0,0 +1,66 @@
+## @formatter:off
+## JFROG ARTIFACTORY SYSTEM CONFIGURATION FILE
+## HOW TO USE: comment-out any field and keep the correct yaml indentation by deleting only the leading '#' character.
+configVersion: 1
+## NOTE: JFROG_HOME is a place holder for the JFrog root directory containing the deployed product, the home directory for all JFrog products.
+## Replace JFROG_HOME with the real path! For example, in RPM install, JFROG_HOME=/opt/jfrog
+
+## NOTE: Sensitive information such as passwords and join key are encrypted on first read.
+## NOTE: The provided commented key and value is the default.
+
+## SHARED CONFIGURATIONS
+## A shared section for keys across all services in this config
+shared:
+    ## Java 17 distribution to use
+    #javaHome: "JFROG_HOME/artifactory/app/third-party/java"
+
+    ## Extra Java options to pass to the JVM. These values add to or override the defaults.
+    #extraJavaOpts: "-Xms512m -Xmx2g"
+
+    ## Security Configuration
+    security:
+    ## Join key value for joining the cluster (takes precedence over 'joinKeyFile')
+    #   joinKey: "<Your joinKey>"
+
+    ## Join key file location
+    #   joinKeyFile: "<For example: JFROG_HOME/artifactory/var/etc/security/join.key>"
+
+    ## Master key file location
+    ## Generated by the product on first startup if not provided
+    #   masterKeyFile: "<For example: JFROG_HOME/artifactory/var/etc/security/master.key>"
+
+    ## Maximum time to wait for key files (master.key and join.key)
+    #   bootstrapKeysReadTimeoutSecs: 120
+    #
+    ## Node Settings
+    node:
+    ## A unique id to identify this node.
+    ## Default auto generated at startup.
+    #   id: "art1"
+
+    ## Default auto resolved by startup script
+    #   ip:
+
+    ## Sets this node as primary in HA installation
+    #   primary: true
+
+    ## Sets this node as part of HA installation
+    #   haEnabled: true
+
+    ## Database Configuration
+    database:
+        ## To run Artifactory with any database other than PostgreSQL allowNonPostgresql set to true.
+        allowNonPostgresql: true
+        ## One of mysql, oracle, mssql, postgresql, mariadb
+        ## Default Embedded derby
+
+        ## Example for postgresql
+        #   type: postgresql
+        #   driver: org.postgresql.Driver
+        #   url: "jdbc:postgresql://<your db url, for example: localhost:5432>/artifactory"
+        #   username: artifactory
+        #   password: password
+access:
+
+## Extra Java options to pass to the JVM. These values add to or override the defaults.
+#extraJavaOpts: "-XX:InitialRAMPercentage=20 -XX:MaxRAMPercentage=25"