Merge branch 'kvm-rancher'

Fixed #3
2021-11-23 11:55:20 +01:00
parent a76036ee59 5084f1ab92
commit 7f1175bf48
17 changed files with 174 additions and 274 deletions
--- a/salt/states/kvm/init.sls
+++ b/salt/states/kvm/init.sls
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 Install kvm server and tools:
  pkg.installed:
 #    - name: pattern:kvm_server
@@ -5,3 +6,21 @@ Install kvm server and tools:
        - pattern:kvm_server
        - pattern:kvm_tools
    - includes: [pattern]
+=======
+Install KVM Server:
+  pkg.installed:
+    - name: pattern:kvm_server
+    - includes: [pattern]
+
+Install KVM Tools:
+  pkg.installed:
+    - name: pattern:kvm_tools
+    - includes: [pattern]
+
+Start libvirtd:
+  service.running:
+    - name: libvirtd
+    - enable: True
+          
+  
+>>>>>>> kvm-rancher