Merge pull request #451 from kt-cheon/ablestack-diplo

스토리지 클러스터 초기화 시 구성 파일 삭제 코드 추가

Author: jschoiRR

python/cluster/cluster_config.py

@@ -77,13 +77,33 @@ def openClusterJson():
 def insert(args):
     try:
         # 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)
-        with open("/etc/sysctl.conf", "a") as sysctl_file:
-            sysctl_file.write("\nnet.bridge.bridge-nf-call-arptables=1")
-            sysctl_file.write("\nnet.bridge.bridge-nf-call-iptables=1")
-            sysctl_file.write("\nnet.bridge.bridge-nf-call-ip6tables=1")
+        # 1. virsh nwfilter 확인 후 정의
+        result = subprocess.run(["virsh", "nwfilter-list"], capture_output=True, text=True)
+        if "allow-all" not in result.stdout:
+            subprocess.run(["virsh", "nwfilter-define", "--file", "/usr/local/sbin/nwfilter-allow-all.xml"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+
+        # 2. br_netfilter 모듈이 로드되지 않았으면 로드
+        lsmod_result = subprocess.run(["lsmod"], capture_output=True, text=True)
+        if "br_netfilter" not in lsmod_result.stdout:
+            subprocess.run(["modprobe", "br_netfilter"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+
+        # 3. sysctl.conf에 설정이 없을 때만 추가
+        settings = [
+            "net.bridge.bridge-nf-call-arptables=1",
+            "net.bridge.bridge-nf-call-iptables=1",
+            "net.bridge.bridge-nf-call-ip6tables=1"
+        ]
+
+        try:
+            with open("/etc/sysctl.conf", "r") as f:
+                existing_lines = f.read()
+        except FileNotFoundError:
+            existing_lines = ""
 
+        with open("/etc/sysctl.conf", "a") as sysctl_file:
+            for line in settings:
+                if line not in existing_lines:
+                    sysctl_file.write(f"\n{line}")
         subprocess.run(["sysctl", "-p"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     # 수정할 cluster.json 파일 읽어오

python/vm/reset_storage_center.py

@@ -51,6 +51,9 @@ def resetStorageCenter(args):
 
     # 스토리지센터 가상머신 qcow2 템플릿 삭제
     os.system("rm -rf /var/lib/libvirt/images/scvm.qcow2")
+    
+    # 스토리지센터 설정 파일 삭제
+    os.system("rm -rf /etc/ceph/*")
 
     '''
     # cloudinit iso 삭제

tools/makerpm/ablestack.spec

@@ -3,7 +3,7 @@
 # 최초 작성일 : 2021. 04. 02
 
 Name: ablecube
-Version: %{?version}%{!?version:4.2}
+Version: %{?version}%{!?version:4.3}
 Release: %{?release}%{!?release:2.wip.el9.noarch}
 Source0: %{name}-%{version}.tar.gz
 Summary: ablestack cube package