new k8s-emc playbook

3 files changed, 36 insertions, 74 deletions

diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml
index fd5bffce..7b1f3210 100644
--- a/inventory/host_vars/emc-master.yml
+++ b/inventory/host_vars/emc-master.yml
@@ -1,42 +1,57 @@
 ---
-vm_host: sk2013
+vm_host: sk-2019vm
 
 install:
   host: "{{ vm_host }}"
-  mem: 1024
-  numcpu: 2
+  mem: 10240
+  numcpu: 6
   disks:
-    primary: /dev/vda
-    virtio:
-      vda:
-        type: lvm
-        vg: storage
-        lv: "{{ inventory_hostname }}"
-        size: 42g
+    primary: /dev/sda
+    scsi:
+      sda:
+        type: zfs
+        pool: storage
+        name: "{{ inventory_hostname }}"
+        size: 20g
+      sdb:
+        type: zfs
+        pool: storage
+        name: "{{ inventory_hostname }}-data"
+        size: 50g
   interfaces:
-  - bridge: "{{ hostvars[vm_host].vm_host.network.interface }}"
+  - bridge: br-public
     name: primary0
   autostart: True
 
 network:
-  nameservers: "{{ hostvars[vm_host].vm_host.network.nameservers }}"
-  domain: spreadspace.org
+  nameservers: "{{ hostvars[vm_host].vm_host.network.dns }}"
+  domain: "{{ host_domain }}"
   systemd_link:
     interfaces: "{{ install.interfaces }}"
   primary:
     interface: primary0
-    ip: "{{ (hostvars[vm_host].vm_host.network.ip+'/'+hostvars[vm_host].vm_host.network.mask) | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ hostvars[vm_host].vm_host.network.mask }}"
-    gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}"
+    ip: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('netmask') }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('address') }}"
+    overlay: "{{ (hostvars[vm_host].vm_host.network.bridges.public.overlay.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
+
 
 docker_lvm:
   vg: "{{ host_name }}"
   lv: docker
-  size: 10G
+  size: 7G
   fs: ext4
 
 kubelet_lvm:
   vg: "{{ host_name }}"
   lv: kubelet
-  size: 10G
+  size: 5G
+  fs: ext4
+
+
+emc_stats_lvm:
+  pvs: /dev/sdb
+  vg: "{{ host_name }}-data"
+  lv: stats
+  size: 42G
   fs: ext4
diff --git a/inventory/host_vars/emc-stats.yml b/inventory/host_vars/emc-stats.yml
deleted file mode 100644
index d8d340b6..00000000
--- a/inventory/host_vars/emc-stats.yml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-vm_host: sk2016
-
-install:
-  host: "{{ vm_host }}"
-  mem: 8192
-  numcpu: 6
-  disks:
-    primary: /dev/vda
-    virtio:
-      vda:
-        type: lvm
-        vg: storage
-        lv: "{{ inventory_hostname }}"
-        size: 42g
-      vdb:
-        type: lvm
-        vg: storage
-        lv: "{{ inventory_hostname }}-data"
-        size: 100g
-  interfaces:
-  - bridge: "{{ hostvars[vm_host].vm_host.network.interface }}"
-    name: primary0
-  autostart: True
-
-network:
-  nameservers: "{{ hostvars[vm_host].vm_host.network.nameservers }}"
-  domain: spreadspace.org
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary:
-    interface: primary0
-    ip: "{{ (hostvars[vm_host].vm_host.network.ip+'/'+hostvars[vm_host].vm_host.network.mask) | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ hostvars[vm_host].vm_host.network.mask }}"
-    gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}"
-
-docker_lvm:
-  vg: "{{ host_name }}"
-  lv: docker
-  size: 15G
-  fs: ext4
-
-kubelet_lvm:
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 10G
-  fs: ext4
-
-emc_stats_lvm:
-  pvs: /dev/vdb
-  vg: "{{ host_name }}-data"
-  lv: stats
-  size: 50G
-  fs: ext4
diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml
index 37f9c97d..511ad7a1 100644
--- a/inventory/host_vars/sk-2019vm.yml
+++ b/inventory/host_vars/sk-2019vm.yml
@@ -25,14 +25,15 @@ vm_host:
           s2-k8s-test3: 2
           s2-k8s-test4: 3
           sk-torrent: 136
-          ch-mimas: 143
+          emc-master: 137
+          ch-mimas: 142
           sk-testvm: 253
         nat: yes
         overlay:
           prefix: 178.63.180.136/29
           offsets:
             sk-torrent: 0
-            s2-k8s-test4: 3
+            emc-master: 1
             ch-mimas: 6
             sk-testvm: 7