From 036f076a589f6dfc55d89bfd9904f0c9aa708e26 Mon Sep 17 00:00:00 2001
From: ByeonJungHun <sa_8001@ex-em.com>
Date: Tue, 19 Sep 2023 17:02:50 +0900
Subject: [PATCH] patch

---
 inventory                                     |  11 +++++----
 jaeger.yaml                                   |   1 +
 jspd.yaml                                     |   1 +
 roles/host/defaults/main.yml                  |   2 +-
 roles/host/files/host-agent/._.               | Bin 0 -> 163 bytes
 "roles/host/files/host-agent/._\\"            | Bin 0 -> 163 bytes
 .../host/files/host-agent/._default_setup.sh  | Bin 0 -> 163 bytes
 roles/host/files/host-agent/._default_stop.sh | Bin 0 -> 163 bytes
 roles/jaeger/defaults/main.yml                |   6 ++---
 roles/jaeger/tasks/delete.yaml                |  22 +++++++++---------
 roles/jspd/defaults/main.yml                  |   4 ++--
 11 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100755 roles/host/files/host-agent/._.
 create mode 100644 "roles/host/files/host-agent/._\\"
 create mode 100755 roles/host/files/host-agent/._default_setup.sh
 create mode 100755 roles/host/files/host-agent/._default_stop.sh

diff --git a/inventory b/inventory
index 170574c..eb122ab 100644
--- a/inventory
+++ b/inventory
@@ -1,13 +1,16 @@
 [cmoa_master]
-cmoa-master-1 ansible_host=10.10.43.200 ip=10.10.43.200
+cmoa-master-2 ansible_host=10.10.43.200 ip=10.10.43.200
 
 ## HOST AGENT INSTALL NODE ##
 
 [containerd]
-master ansible_host=10.10.43.227 ip=10.10.43.227
-worker01 ansible_host=10.10.43.228 ip=10.10.43.228
+cmoa-jspd-master ansible_host=10.10.43.206 ip=10.10.43.206
+cmoa-jspd-worker1 ansible_host=10.10.43.207 ip=10.10.43.207
+cmoa-jspd-worker2 ansible_host=10.10.43.208 ip=10.10.43.208
 
 [docker]
 
 [crio]
-worker02 ansible_host=10.10.43.229 ip=10.10.43.229
+
+[agent-master]
+cmoa-jspd-master ansible_host=10.10.43.206 ip=10.10.43.206
diff --git a/jaeger.yaml b/jaeger.yaml
index 0c58d20..d43b6c3 100644
--- a/jaeger.yaml
+++ b/jaeger.yaml
@@ -4,3 +4,4 @@
   gather_facts: false
   roles:
     - role: jaeger
+      delegate_to: 127.0.0.1
diff --git a/jspd.yaml b/jspd.yaml
index 7c4d407..183f55e 100644
--- a/jspd.yaml
+++ b/jspd.yaml
@@ -4,3 +4,4 @@
   gather_facts: false
   roles:
     - role: jspd
+      delegate_to: 127.0.0.1
diff --git a/roles/host/defaults/main.yml b/roles/host/defaults/main.yml
index 329db17..b77d4a6 100644
--- a/roles/host/defaults/main.yml
+++ b/roles/host/defaults/main.yml
@@ -4,4 +4,4 @@ delete_enabled: false
 
 NAMESAPCE: imxc-agent
 DATAGATE: 10.10.43.200:35001
-VERSION: 3.5.2
+VERSION: 3.5.4
diff --git a/roles/host/files/host-agent/._. b/roles/host/files/host-agent/._.
new file mode 100755
index 0000000000000000000000000000000000000000..8355c380cda16c2c6e700b45e7ce5ee10e15254f
GIT binary patch
literal 163
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S
nBE&_L^K<nQ3kq^l^$Lpe%Tn_a^O92;fC^Nmvi50Q<XQv(Fq0C^

literal 0
HcmV?d00001

diff --git "a/roles/host/files/host-agent/._\\" "b/roles/host/files/host-agent/._\\"
new file mode 100644
index 0000000000000000000000000000000000000000..8355c380cda16c2c6e700b45e7ce5ee10e15254f
GIT binary patch
literal 163
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S
nBE&_L^K<nQ3kq^l^$Lpe%Tn_a^O92;fC^Nmvi50Q<XQv(Fq0C^

literal 0
HcmV?d00001

diff --git a/roles/host/files/host-agent/._default_setup.sh b/roles/host/files/host-agent/._default_setup.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8355c380cda16c2c6e700b45e7ce5ee10e15254f
GIT binary patch
literal 163
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S
nBE&_L^K<nQ3kq^l^$Lpe%Tn_a^O92;fC^Nmvi50Q<XQv(Fq0C^

literal 0
HcmV?d00001

diff --git a/roles/host/files/host-agent/._default_stop.sh b/roles/host/files/host-agent/._default_stop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8355c380cda16c2c6e700b45e7ce5ee10e15254f
GIT binary patch
literal 163
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S
nBE&_L^K<nQ3kq^l^$Lpe%Tn_a^O92;fC^Nmvi50Q<XQv(Fq0C^

literal 0
HcmV?d00001

diff --git a/roles/jaeger/defaults/main.yml b/roles/jaeger/defaults/main.yml
index 6f641a0..f5c288a 100644
--- a/roles/jaeger/defaults/main.yml
+++ b/roles/jaeger/defaults/main.yml
@@ -3,6 +3,6 @@
 delete_enabled: false
 
 NAMESAPCE: imxc-agent
-CLUSTER_ID: kk-MJy2q2OkNiGkm
-DATAGATE: 10.10.43.200:35001
-VERSION: 3.5.2
\ No newline at end of file
+CLUSTER_ID: bMsF5W8UYTac5n7l
+DATAGATE: 10.10.43.200:30051
+VERSION: 3.5.4
diff --git a/roles/jaeger/tasks/delete.yaml b/roles/jaeger/tasks/delete.yaml
index d1805f5..19f9e47 100644
--- a/roles/jaeger/tasks/delete.yaml
+++ b/roles/jaeger/tasks/delete.yaml
@@ -1,38 +1,38 @@
 ---
-- name: jspd tpcc delete
+- name: jaeger tpcc delete
   kubernetes.core.helm:
-    chart_ref: "/root/jspd-tpcc"
-    name: jspd-tpcc
+    chart_ref: "/root/jaeger-tpcc"
+    name: jaeger-tpcc
     namespace: default
     state: absent
     wait: true
   when:
     - inventory_hostname == groups['agent-master'][0]
 
-- name: jspd client delete
+- name: jaeger client delete
   kubernetes.core.helm:
-    chart_ref: "/root/jspd-client"
-    name: jspd-client
+    chart_ref: "/root/jaeger-client"
+    name: jaeger-client
     namespace: "{{ NAMESAPCE }}"
     state: absent
     wait: true
   when:
     - inventory_hostname == groups['agent-master'][0]
 
-- name: old jspd-client directory delete
+- name: old jaeger-client directory delete
   ignore_errors: true
   file:
-    path: /root/jspd-client
+    path: /root/jaeger-client
     state: absent
   when:
     - delete_enabled
     - inventory_hostname in groups['docker'] or inventory_hostname in groups['containerd'] or inventory_hostname in groups['crio']
 
-- name: old jspd-tpcc directory delete
+- name: old jaeger-tpcc directory delete
   ignore_errors: true
   file:
-    path: /root/jspd-tpcc
+    path: /root/jaeger-tpcc
     state: absent
   when:
     - delete_enabled
-    - inventory_hostname in groups['docker'] or inventory_hostname in groups['containerd'] or inventory_hostname in groups['crio']
\ No newline at end of file
+    - inventory_hostname in groups['docker'] or inventory_hostname in groups['containerd'] or inventory_hostname in groups['crio']
diff --git a/roles/jspd/defaults/main.yml b/roles/jspd/defaults/main.yml
index 2618f01..cd72a0a 100644
--- a/roles/jspd/defaults/main.yml
+++ b/roles/jspd/defaults/main.yml
@@ -3,7 +3,7 @@
 delete_enabled: false
 
 NAMESAPCE: imxc-agent
-CLUSTER_ID: kk-MJy2q2OkNiGkm
+CLUSTER_ID: K5kqSh9_7qkXYZfy
 DATAGATE: 10.10.43.200:35001
 DATAGATE_IP: 10.10.43.200
-VERSION: 3.5.2
\ No newline at end of file
+VERSION: 3.5.4