release 3.5.0

roles/cmoa_install/tasks/02-base-install.yml

@@ -49,3 +49,20 @@
           port: "{{ elasticsearch_service_port }}"
           nodePort: "{{ elasticsearch_nodePort }}"
     apply: yes
+
+- name: 6. Change a Postgres Service (NodePort=postgres_nodePort)
+  kubernetes.core.k8s:
+    state: present
+    definition:
+      apiVersion: v1
+      kind: Service
+      metadata:
+        name: "{{ postgres_service_name }}"
+        namespace: "{{ cmoa_namespace }}"
+      spec:
+        type: NodePort
+        ports:
+        - protocol: TCP
+          port: "{{ postgres_service_port }}"
+          nodePort: "{{ postgres_nodePort }}"
+    apply: yes

roles/cmoa_install/tasks/06-imxc-ui-install.yml

@@ -1,79 +1,4 @@
 ---
-- name: 1. helmchart install (imxc-ui-all)
-  kubernetes.core.helm:
-    name: "{{item}}"
-    release_name: "{{item}}"
-    release_namespace: "{{ cmoa_namespace }}"
-    chart_ref: "{{ role_path }}/files/06-imxc-ui/{{ item }}"
-    create_namespace: yes
-    release_state: present
-    values_files:
-    - "{{ role_path }}/files/06-imxc-ui/{{ item }}/values.yaml"
-  with_items:
-    - imxc-ui-jaeger
-    - imxc-ui-jspd
-  when: imxc_ui == 'all'
-
-- name: 1. helmchart install (imxc-ui-jaeger)
-  kubernetes.core.helm:
-    name: "{{item}}"
-    release_name: "{{item}}"
-    release_namespace: "{{ cmoa_namespace }}"
-    chart_ref: "{{ role_path }}/files/06-imxc-ui/{{ item }}"
-    create_namespace: yes
-    release_state: present
-    values_files:
-    - "{{ role_path }}/files/06-imxc-ui/{{ item }}/values.yaml"
-  with_items:
-    - imxc-ui-jaeger
-  when: imxc_ui == 'jaeger'
-
-- name: 2. Change a imxc-ui Service (imxc-ui-jaeger)
-  kubernetes.core.k8s:
-    state: present
-    definition:
-      apiVersion: v1
-      kind: Service
-      metadata:
-        name: "{{ jaeger_servicename }}"
-        namespace: "{{ cmoa_namespace }}"
-      spec:
-        type: NodePort
-        ports:
-        - protocol: TCP
-          port: "{{ jaeger_service_port }}"
-          nodePort: "{{ jaeger_nodePort }}"
-    apply: yes
-  when: imxc_ui == 'jaeger'
-
-- name: 2. Get a list of all pods from the namespace
-  command: kubectl -n "{{ cmoa_namespace }}" get pods --no-headers -o custom-columns=":metadata.name" # Output is a column
-  register: pod_list
-  when: imxc_ui != 'all'
-
-- name: 3. Copy psql file in psql (imxc-jaeger)
-  kubernetes.core.k8s_cp:
-    namespace: "{{ cmoa_namespace }}"
-    pod: "{{ item }}"
-    remote_path: /tmp/jaeger_menumeta.psql
-    local_path: "{{ role_path }}/files/03-ddl-dml/postgres/jaeger_menumeta.psql"
-  with_items: "{{ pod_list.stdout_lines }}"
-  when: 
-    - item is match('postgres')
-    - imxc_ui == 'jaeger'
-  ignore_errors: true
-
-- name: 4. Execute a command in psql (imxc-jaeger)
-  kubernetes.core.k8s_exec:
-    namespace: "{{ cmoa_namespace }}"
-    pod: "{{ item }}"
-    command: bash -c "PGPASSWORD='eorbahrhkswp' && /usr/bin/psql -h 'localhost' -U 'admin' -d 'postgresdb' -f /tmp/jaeger_menumeta.psql"
-  with_items: "{{ pod_list.stdout_lines }}"
-  when: 
-    - item is match('postgres')
-    - imxc_ui == 'jaeger'
-  ignore_errors: true
-
 - name: 1. helmchart install (imxc-ui-jspd)
   kubernetes.core.helm:
     name: "{{item}}"
@@ -85,27 +10,7 @@
     values_files:
     - "{{ role_path }}/files/06-imxc-ui/{{ item }}/values.yaml"
   with_items:
-    - imxc-ui-jspd
-  when: imxc_ui == 'jspd'
-  ignore_errors: true
-
-- name: 3. Copy psql file in postgres (imxc-ui-jspd) 
-  kubernetes.core.k8s_cp:
-    namespace: "{{ cmoa_namespace }}"
-    pod: "{{ item }}"
-    remote_path: /tmp/jspd_menumeta.psql
-    local_path: "{{ role_path }}/files/03-ddl-dml/postgres/jspd_menumeta.psql"
-  with_items: "{{ pod_list.stdout_lines }}"
-  when: item is match('postgres') and imxc_ui == 'jspd'
-  ignore_errors: true
-
-- name: 4. Execute a command in postgres (imxc-ui-jspd)
-  kubernetes.core.k8s_exec:
-    namespace: "{{ cmoa_namespace }}"
-    pod: "{{ item }}"
-    command: bash -c "PGPASSWORD='eorbahrhkswp' && /usr/bin/psql -h 'localhost' -U 'admin' -d 'postgresdb' -f /tmp/jspd_menumeta.psql"
-  with_items: "{{ pod_list.stdout_lines }}"
-  when: item is match('postgres') and imxc_ui == 'jspd'
+    - imxc-ui
   ignore_errors: true
 
 - name: 2. Check Kubernetes Pods (imxc ui)

roles/cmoa_install/tasks/06-imxc-ui-install.yml_bak

@@ -0,0 +1,112 @@
+---
+- name: 1. helmchart install (imxc-ui-all)
+  kubernetes.core.helm:
+    name: "{{item}}"
+    release_name: "{{item}}"
+    release_namespace: "{{ cmoa_namespace }}"
+    chart_ref: "{{ role_path }}/files/06-imxc-ui/{{ item }}"
+    create_namespace: yes
+    release_state: present
+    values_files:
+    - "{{ role_path }}/files/06-imxc-ui/{{ item }}/values.yaml"
+  with_items:
+    - imxc-ui-jaeger
+    - imxc-ui-jspd
+  when: imxc_ui == 'all'
+
+- name: 1. helmchart install (imxc-ui-jaeger)
+  kubernetes.core.helm:
+    name: "{{item}}"
+    release_name: "{{item}}"
+    release_namespace: "{{ cmoa_namespace }}"
+    chart_ref: "{{ role_path }}/files/06-imxc-ui/{{ item }}"
+    create_namespace: yes
+    release_state: present
+    values_files:
+    - "{{ role_path }}/files/06-imxc-ui/{{ item }}/values.yaml"
+  with_items:
+    - imxc-ui-jaeger
+  when: imxc_ui == 'jaeger'
+
+- name: 2. Change a imxc-ui Service (imxc-ui-jaeger)
+  kubernetes.core.k8s:
+    state: present
+    definition:
+      apiVersion: v1
+      kind: Service
+      metadata:
+        name: "{{ jaeger_servicename }}"
+        namespace: "{{ cmoa_namespace }}"
+      spec:
+        type: NodePort
+        ports:
+        - protocol: TCP
+          port: "{{ jaeger_service_port }}"
+          nodePort: "{{ jaeger_nodePort }}"
+    apply: yes
+  when: imxc_ui == 'jaeger'
+
+- name: 2. Get a list of all pods from the namespace
+  command: kubectl -n "{{ cmoa_namespace }}" get pods --no-headers -o custom-columns=":metadata.name" # Output is a column
+  register: pod_list
+  when: imxc_ui != 'all'
+
+- name: 3. Copy psql file in psql (imxc-jaeger)
+  kubernetes.core.k8s_cp:
+    namespace: "{{ cmoa_namespace }}"
+    pod: "{{ item }}"
+    remote_path: /tmp/jaeger_menumeta.psql
+    local_path: "{{ role_path }}/files/03-ddl-dml/postgres/jaeger_menumeta.psql"
+  with_items: "{{ pod_list.stdout_lines }}"
+  when: 
+    - item is match('postgres')
+    - imxc_ui == 'jaeger'
+  ignore_errors: true
+
+- name: 4. Execute a command in psql (imxc-jaeger)
+  kubernetes.core.k8s_exec:
+    namespace: "{{ cmoa_namespace }}"
+    pod: "{{ item }}"
+    command: bash -c "PGPASSWORD='eorbahrhkswp' && /usr/bin/psql -h 'localhost' -U 'admin' -d 'postgresdb' -f /tmp/jaeger_menumeta.psql"
+  with_items: "{{ pod_list.stdout_lines }}"
+  when: 
+    - item is match('postgres')
+    - imxc_ui == 'jaeger'
+  ignore_errors: true
+
+- name: 1. helmchart install (imxc-ui-jspd)
+  kubernetes.core.helm:
+    name: "{{item}}"
+    release_name: "{{item}}"
+    release_namespace: "{{ cmoa_namespace }}"
+    chart_ref: "{{ role_path }}/files/06-imxc-ui/{{ item }}"
+    create_namespace: yes
+    release_state: present
+    values_files:
+    - "{{ role_path }}/files/06-imxc-ui/{{ item }}/values.yaml"
+  with_items:
+    - imxc-ui-jspd
+  when: imxc_ui == 'jspd'
+  ignore_errors: true
+
+- name: 3. Copy psql file in postgres (imxc-ui-jspd) 
+  kubernetes.core.k8s_cp:
+    namespace: "{{ cmoa_namespace }}"
+    pod: "{{ item }}"
+    remote_path: /tmp/jspd_menumeta.psql
+    local_path: "{{ role_path }}/files/03-ddl-dml/postgres/jspd_menumeta.psql"
+  with_items: "{{ pod_list.stdout_lines }}"
+  when: item is match('postgres') and imxc_ui == 'jspd'
+  ignore_errors: true
+
+- name: 4. Execute a command in postgres (imxc-ui-jspd)
+  kubernetes.core.k8s_exec:
+    namespace: "{{ cmoa_namespace }}"
+    pod: "{{ item }}"
+    command: bash -c "PGPASSWORD='eorbahrhkswp' && /usr/bin/psql -h 'localhost' -U 'admin' -d 'postgresdb' -f /tmp/jspd_menumeta.psql"
+  with_items: "{{ pod_list.stdout_lines }}"
+  when: item is match('postgres') and imxc_ui == 'jspd'
+  ignore_errors: true
+
+- name: 2. Check Kubernetes Pods (imxc ui)
+  command: "{{ role_path }}/files/k8s_status {{ cmoa_namespace }}"

roles/cmoa_install/tasks/08-finish.yml

@@ -12,6 +12,5 @@
     msg: 
       - =======================================================================================
       - "## CloudMOA WEB "
-      - CloudMOA Jaeger = http://{{ ansible_default_ipv4.address }}:31080
-      - CloudMOA JSPD   = http://{{ ansible_default_ipv4.address }}:31084
+      - http://{{ ansible_default_ipv4.address }}:31080
       - =======================================================================================

roles/cmoa_install/tasks/main.yml

@@ -3,8 +3,8 @@
   tags: worker-dir
   when: kubernetes_role == 'node'
 
-- include: helm-install.yml
-  tags: helm-install
+    #- include: helm-install.yml
+    #  tags: helm-install
 
 - include: 00-default-settings-master.yml
   tags: default_setting