Merge pull request #452 from ablecloud-team/revert-450-ablestack-diplo

Revert "ovs일 경우 sysctl 적용 해제 및 Cube 호스트 제거 할 시 json 초기화 오류 수정"

Author: jschoiRR

python/cluster/cluster_config.py

@@ -76,7 +76,6 @@ def openClusterJson():
 # 파라미터로 받은 json 값으로 cluster_config.py 무조건 바꾸는 함수 (동일한 값이 있으면 변경, 없으면 추가)
 def insert(args):
     try:
-        openvswitch_service_check = os.system("systemctl is-active openvswitch > /dev/null")
         # Network Filter 적용
         subprocess.run(["virsh", "nwfilter-define", "--file", "/usr/local/sbin/nwfilter-allow-all.xml"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
         subprocess.run(["modprobe", "br_netfilter"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
@@ -85,8 +84,7 @@ def insert(args):
             sysctl_file.write("\nnet.bridge.bridge-nf-call-iptables=1")
             sysctl_file.write("\nnet.bridge.bridge-nf-call-ip6tables=1")
 
-        if openvswitch_service_check != 0:
-            subprocess.run(["sysctl", "-p"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        subprocess.run(["sysctl", "-p"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     # 수정할 cluster.json 파일 읽어오
         # 기존 file json 데이터를 param 데이터로 교체

python/cluster/remove_cube_host.py

@@ -87,7 +87,7 @@ def remove(args):
             outfile.write('{\n')
             outfile.write('    "bootstrap": {\n')
             outfile.write('        "scvm": "false",\n')
-            outfile.write('        "ccvm": "false",\n')
+            outfile.write('        "ccvm": "false"\n')
             outfile.write('        "pfmp": "false"\n')
             outfile.write('    },\n')
             outfile.write('    "monitoring": {\n')
@@ -98,7 +98,6 @@ def remove(args):
             with open(cluster_file_path, 'w') as outfile:
                 outfile.write('{\n')
                 outfile.write('    "clusterConfig": {\n')
-                outfile.write('        "type": "",\n')
                 outfile.write('        "ccvm": {\n')
                 outfile.write('            "ip": ""\n')
                 outfile.write('            "pn": ""\n')
@@ -130,7 +129,6 @@ def remove(args):
             with open(cluster_file_path, 'w') as outfile:
                 outfile.write('{\n')
                 outfile.write('    "clusterConfig": {\n')
-                outfile.write('        "type": "",\n')
                 outfile.write('        "ccvm": {\n')
                 outfile.write('            "ip": ""\n')
                 outfile.write('        },\n')