Merge branch 'master' into fetlab

2019-03-19 16:34:47 +01:00
parent 1fafdf2da9 f46321ae83
commit 48c881f948
46 changed files with 2038 additions and 95 deletions
--- a/hosts/production
+++ b/hosts/production
@@ -6,20 +6,23 @@ all:
        fetlab:
    fet_lxc_debian:
      hosts:
-        lxc-pet-01:
-        laika:
        betam:
        proteus:
+        juri:
    fet_lxc_void:
      hosts:
+        sputnik:
        zyklon:
-        sojus:
+        laika:
        progress:
+        fsdrnas:
    fet_qemu:
      hosts:
        maria-storage:
        buran:
        nauka:
+        ruby:
+        fsdr:
    fet_pi:
      hosts:
        baroness:
--- a/hosts/production_pet
+++ b/hosts/production_pet
@@ -1,2 +0,0 @@
-[fet_container]
-lxc-pet-01
--- a/hosts/test_andi
+++ b/hosts/test_andi
@@ -1,3 +0,0 @@
-[ruby]
-#test01
-test03