diff --git a/inventories/opengauss/cluster_config.xml b/inventories/opengauss/cluster_config.xml
index ad3066fadec3ed5ed6ec1818bd575a86eec48f5e..7964169725ae199409803f5c3bc70cc4c4f292a6 100644
--- a/inventories/opengauss/cluster_config.xml
+++ b/inventories/opengauss/cluster_config.xml
@@ -7,59 +7,59 @@
     <PARAM name="tmpMppdbPath" value="/opt/openGauss/tmp"/>
     <PARAM name="gaussdbToolPath" value="/opt/openGauss/install/om" />
     <PARAM name="corePath" value="/opt/openGauss/corefile"/>
-    <PARAM name="nodeNames" value="og3232249874
-      ,og3232249871
-      ,og3232249875
+    <PARAM name="nodeNames" value="og3232249867
+      ,og3232249868
+      ,og3232249869
     "/>
-    <PARAM name="backIp1s" value="192.168.56.18
-      ,192.168.56.15
-      ,192.168.56.19
+    <PARAM name="backIp1s" value="192.168.56.11
+      ,192.168.56.12
+      ,192.168.56.13
     "/>
   </CLUSTER>
 
   <DEVICELIST>
 
     <!-- CLUSTER PRIMARY -->
-    <DEVICE sn="og3232249874">
-      <PARAM name="name" value="og3232249874"/>
-      <PARAM name="instanceId" value="3232249874"/>
+    <DEVICE sn="og3232249867">
+      <PARAM name="name" value="og3232249867"/>
+      <PARAM name="instanceId" value="3232249867"/>
       <PARAM name="azName" value="AZ1"/>
       <PARAM name="azPriority" value="1"/>
-      <PARAM name="backIp1" value="192.168.56.18"/>
-      <PARAM name="sshIp1" value="192.168.56.18"/>
+      <PARAM name="backIp1" value="192.168.56.11"/>
+      <PARAM name="sshIp1" value="192.168.56.11"/>
 
       <!-- Data Node -->
       <PARAM name="dataNum" value="1"/>
       <PARAM name="dataPortBase" value="15400"/>
       <PARAM name="dataNode1" value="/opt/openGauss/data/dn
-        ,og3232249871,/opt/openGauss/data/dn
-        ,og3232249875,/opt/openGauss/data/dn
+        ,og3232249868,/opt/openGauss/data/dn
+        ,og3232249869,/opt/openGauss/data/dn
       "/>
       <PARAM name="dataNode1_syncNum" value="0"/><!-- CLUSTER MANAGER -->
       <PARAM name="cmsNum" value="1"/>
       <PARAM name="cmServerPortBase" value="15300"/>
       <PARAM name="cmServerlevel" value="1"/>
       <PARAM name="cmDir" value="/opt/openGauss/data/cmserver"/>
-      <PARAM name="cmServerRelation" value="og3232249874
-        ,og3232249871
-        ,og3232249875
+      <PARAM name="cmServerRelation" value="og3232249867
+        ,og3232249868
+        ,og3232249869
       "/>
-      <PARAM name="cmServerListenIp1" value="192.168.56.18
-        ,192.168.56.15
-        ,192.168.56.19
+      <PARAM name="cmServerListenIp1" value="192.168.56.11
+        ,192.168.56.12
+        ,192.168.56.13
       "/>
-      <PARAM name="cmServerHaIp1" value="192.168.56.18
-        ,192.168.56.15
-        ,192.168.56.19
+      <PARAM name="cmServerHaIp1" value="192.168.56.11
+        ,192.168.56.12
+        ,192.168.56.13
       "/></DEVICE>
 
 
-    <DEVICE sn="og3232249871">
-      <PARAM name="name" value="og3232249871"/>
+    <DEVICE sn="og3232249868">
+      <PARAM name="name" value="og3232249868"/>
       <PARAM name="azName" value="AZ1"/>
       <PARAM name="azPriority" value="1"/>
-      <PARAM name="backIp1" value="192.168.56.15"/>
-      <PARAM name="sshIp1" value="192.168.56.15"/>
+      <PARAM name="backIp1" value="192.168.56.12"/>
+      <PARAM name="sshIp1" value="192.168.56.12"/>
 
       <!-- CLUSTER MANAGER -->
       <PARAM name="cmServerPortStandby" value="15800"/>
@@ -67,17 +67,19 @@
 
     </DEVICE>
 
-    <DEVICE sn="og3232249875">
-      <PARAM name="name" value="og3232249875"/>
+    <DEVICE sn="og3232249869">
+      <PARAM name="name" value="og3232249869"/>
       <PARAM name="azName" value="AZ1"/>
       <PARAM name="azPriority" value="1"/>
-      <PARAM name="backIp1" value="192.168.56.19"/>
-      <PARAM name="sshIp1" value="192.168.56.19"/>
+      <PARAM name="backIp1" value="192.168.56.13"/>
+      <PARAM name="sshIp1" value="192.168.56.13"/>
 
       <!-- CLUSTER MANAGER -->
       <PARAM name="cmServerPortStandby" value="15800"/>
       <PARAM name="cmDir" value="/opt/openGauss/data/cmserver"/>
 
+      <!-- CASCADE ROLE -->
+      <PARAM name="cascadeRole" value="on"/>
     </DEVICE>
 
 
diff --git a/inventories/opengauss/hosts.ini b/inventories/opengauss/hosts.ini
index 5353de2fa6a63971308bf29ceb3936aa4cce0305..3a59a1e3aa49abe0ffa0ea81faa9740fd9bcf580 100644
--- a/inventories/opengauss/hosts.ini
+++ b/inventories/opengauss/hosts.ini
@@ -1,20 +1,14 @@
 ; 主机，仅设置 1 个目标机。
 [opengauss_master]
-192.168.56.18
+192.168.56.11
 
 ; 备机，可设置若干个或留空。
 [opengauss_follower]
-; 192.168.56.13
-192.168.56.15
-192.168.56.19
+192.168.56.12
 
 ; 级联机，可设置若干个或留空。
 [opengauss_cascade]
-; 192.168.56.11
-; 192.168.56.12
-192.168.56.14
-192.168.56.16
-; 192.168.56.17
+;192.168.56.13
 
 ; 以上 3 个分组的合并组，勿动。
 [opengauss:children]
diff --git a/roles/opengauss/tasks/deploy/cluster_check.yml b/roles/opengauss/tasks/deploy/cluster_check.yml
index 50c7f0e5a46b133c7c1e0bd11a348d2be3853f27..f8d7909500c5427042513d35bd7fe2a23a91dd41 100644
--- a/roles/opengauss/tasks/deploy/cluster_check.yml
+++ b/roles/opengauss/tasks/deploy/cluster_check.yml
@@ -22,6 +22,7 @@
     - name: Import runtime tasks
       ansible.builtin.import_tasks:
         file: deploy/runtime_groups.yml
+      run_once: true
 
     - name: Import deploy tasks
       ansible.builtin.import_tasks:
@@ -29,13 +30,14 @@
       delegate_to: "{{ og_master }}"
       run_once: true
       vars:
-        cm_nodes: "{{ (groups['opengauss_cm'] is defined) | ternary(groups['opengauss_cm'], '') | sort }}"
-        dn_nodes: "{{ (groups['opengauss_dn'] is defined) | ternary(groups['opengauss_dn'], '') | sort }}"
+        cm_nodes: "{{ (og_all_nodes | count > 2) | ternary(og_all_nodes, '') | sort }}"
+        dn_nodes: "{{ groups['opengauss_dn'] | sort }}"
         ep_nodes: "{{ (groups['opengauss_ep'] is defined) | ternary(groups['opengauss_ep'], '') | sort }}"
+        og_cm_enabled: "{{ og_all_nodes | count > 2 }}"
 
-    - name: Repeat tasks
-      ansible.builtin.include_tasks:
-        file: deploy/cluster_check.yml
+#    - name: Repeat tasks
+#      ansible.builtin.include_tasks:
+#        file: deploy/cluster_check.yml
 
 - name: Mission aborted
   when:
diff --git a/roles/opengauss/tasks/deploy/runtime_groups.yml b/roles/opengauss/tasks/deploy/runtime_groups.yml
index d7571569dea38c9f297596b1979873eabf128e26..514a3914cbe9074313bd4b732b191bb171a19ad5 100644
--- a/roles/opengauss/tasks/deploy/runtime_groups.yml
+++ b/roles/opengauss/tasks/deploy/runtime_groups.yml
@@ -17,6 +17,7 @@
 
 # 如果已部署集群
 - name: If deployed
+  when: "gs_detail is succeeded"
   block:
     # 不在集群里的 IP 加入到扩展节点分组。
     - name: Create group 'opengauss_ep'
@@ -70,24 +71,24 @@
       vars:
         node_info: "{{ line | regex_replace(' {1,}', '|') | split('|') }}"
 
-# # 如果未部署集群
-# - name: Create init data nodes list
-#   ansible.builtin.add_host:
-#     hostname: "{{ node }}"
-#     groups:
-#       - opengauss_dn
-#     node_ip: "{{ node }}"
-#     node_name: "og{{ node | ipaddr('int') }}"
-#   loop: "{{ groups['opengauss'] }}"
-#   loop_control:
-#     loop_var: node
-#     extended: true
-#   when: "gs_detail.stdout_lines is falsy"
+# 如果未部署集群
+- name: Create init data nodes list
+  ansible.builtin.add_host:
+    hostname: "{{ node }}"
+    groups:
+      - opengauss_dn
+    node_ip: "{{ node }}"
+    node_name: "og{{ node | ipaddr('int') }}"
+  loop: "{{ groups['opengauss'] }}"
+  loop_control:
+    loop_var: node
+    extended: true
+  when: "gs_detail is failed"
 
-# - name: Current data nodes
-#   ansible.builtin.debug:
-#     msg: "{{ groups['opengauss_dn'] }}"
-#   when: "groups['opengauss_dn'] is defined"
+- name: Current data nodes
+  ansible.builtin.debug:
+    msg: "{{ groups['opengauss_dn'] }}"
+  when: "groups['opengauss_dn'] is defined"
 
 # # 如果未部署 CM 且为单节点
 # - name: Create groups for CM deploy | Single node mode
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 6977b6fb62f05abb03571150c5fe4865497abd9d..baa571677a748b32b0deaea6800785351b945eb0 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -13,8 +13,8 @@ Vagrant.configure("2") do |config|
   config.vm.guest = "centos"
 
   config.vm.provider "virtualbox" do |vb|
-    vb.memory = 4096
-    vb.cpus = 4
+    vb.memory = 1024 * 16
+    vb.cpus = 8
     vb.customize [ "modifyvm", :id, "--uartmode1", "disconnected" ]
     vb.linked_clone = true
     vb.check_guest_additions = false
@@ -31,7 +31,7 @@ Vagrant.configure("2") do |config|
   config.vm.synced_folder ".", "/vagrant", disabled: true
 
   # How many vm do you want?
-  N = 9
+  N = 3
 
   (1..N).each do |i|
     config.vm.define "opengauss#{i}" do |node|