Merge "TCWG: Map TCWG hosts"

4 files changed, 77 insertions, 21 deletions

diff --git a/hosts b/hosts
index 1cd2869..faac90c 100644
--- a/hosts
+++ b/hosts
@@ -113,17 +113,13 @@ kvmdispatcher.tcwglab
 abe.tcwglab
 
 [tcwg-build]
-build-[01:12].tcwglab
+build-[01:09].tcwglab
 
 [tcwg-test]
 #test-x86_64-01.tcwglab
 
 [tcwg-apms]
-apm-[01:03].tcwglab
-
-[test-apms]
-test-armv8-01.tcwglab tcwg_rootg=False
-test-armv8-02.tcwglab tcwg_rootg=True
+apm-[01:04].tcwglab
 
 [tcwg-dev]
 dev-01.tcwglab
@@ -139,6 +135,21 @@ lxc-[01:03].tcwglab
 lava.tcwglab
 kvmdispatcher.tcwglab
 
+[tcwg-nvidia-builders]
+tcwg-tk1-[01:04].tcwglab
+tcwg-tk1-09.tcwglab
+tcwg-tx1-[01:04].tcwglab
+
+[tcwg-nvidia-dev]
+tcwg-tk1-05.tcwglab
+tcwg-tx1-05.tcwglab
+tcwg-tk1-test.tcwglab
+tcwg-tx1-test.tcwglab
+
+[tcwg-nvidia-benchmark]
+tcwg-tk1-[06:08].tcwglab
+tcwg-tx1-[06:08].tcwglab
+
 [tcwg-nvidia]
 tcwg-tx1-[01:08].tcwglab
 tcwg-tk1-[01:09].tcwglab
@@ -151,10 +162,12 @@ llvm-tk1-[01:09].tcwglab
 [tcwg:children]
 tcwg-build
 tcwg-apms
-test-apms
 tcwg-nvidia
 tcwg-dev
 tcwg-test
+tcwg-nvidia-builders
+tcwg-nvidia-dev
+tcwg-nvidia-benchmark
 
 [tcwg-bmk]
 tcwg-tx1-[06:08].tcwglab
@@ -198,7 +211,3 @@ lngmaster.lavalab
 
 [devcloud]
 server01.devcloud
-
-
-
-
diff --git a/playbooks/tcwg_benchmark.yml b/playbooks/tcwg_benchmark.yml
new file mode 100644
index 0000000..6e21924
--- /dev/null
+++ b/playbooks/tcwg_benchmark.yml
@@ -0,0 +1,23 @@
+---
+
+# Playbook tcwg benchmark
+
+- hosts: tcwg-nvidia-benchmark
+
+  vars:
+     repo: 'deb http://ftp.linuxfoundation.org/pub/lsb/repositories/debian lsb-5.0 main'
+     repo_key: http://ftp.linuxfoundation.org/pub/lsb/keys-for-rpm/lsb-repo-2CF4470F.txt
+     tcwg_sshd: True
+
+  roles:
+     - common
+     - lab-sssd-access
+     - { role: tcwg-apt-repo-add, when: ansible_architecture == "x86_64" }
+     - tcwg-apt-install
+     - tcwg-benchmark-sudo
+     - tcwg-docker
+     - tcwg-infra-sudo
+     - tcwg-noautoupdate
+     - tcwg-perf
+     - tcwg-service-control
+     - tcwg-sysctl
diff --git a/playbooks/tcwg_builders.yml b/playbooks/tcwg_builders.yml
new file mode 100644
index 0000000..988769e
--- /dev/null
+++ b/playbooks/tcwg_builders.yml
@@ -0,0 +1,23 @@
+---
+
+# Playbook tcwg-builder machines
+
+- hosts: tcwg-apms:tcwg-build:tcwg-nvidia-builders
+
+  vars:
+     repo: 'deb http://ftp.linuxfoundation.org/pub/lsb/repositories/debian lsb-5.0 main'
+     repo_key: http://ftp.linuxfoundation.org/pub/lsb/keys-for-rpm/lsb-repo-2CF4470F.txt
+     tcwg_sshd: True
+
+  roles:
+     - common
+     - lab-sssd-access
+     - { role: tcwg-apt-repo-add, when: ansible_architecture == "x86_64" }
+     - tcwg-apt-install
+     - tcwg-docker
+     - tcwg-infra-sudo
+     - tcwg-iotop
+     - tcwg-noautoupdate
+     - tcwg-service-control
+     - tcwg-stop-not-needed-services
+     - tcwg-sysctl
diff --git a/playbooks/tcwg_dev.yml b/playbooks/tcwg_dev.yml
index 6329b2c..d44aeec 100644
--- a/playbooks/tcwg_dev.yml
+++ b/playbooks/tcwg_dev.yml
@@ -1,23 +1,24 @@
 ---
 
-# Playbook to set up basic config (vim-nox, ntpd, static routes)
+# Playbook tcwg-dev machines
 
-- hosts: all
+- hosts: tcwg-dev:tcwg-nvidia-dev
 
   vars:
-     id_key: 2CF4470F
      repo: '"deb http://ftp.linuxfoundation.org/pub/lsb/repositories/debian lsb-5.0 main"'
      repo_key: http://ftp.linuxfoundation.org/pub/lsb/keys-for-rpm/lsb-repo-2CF4470F.txt
-     extended: false
+     tcwg_sshd: True
 
   roles:
      - common
-#     - admin-access
-     - { role: tcwg-apt-repo-add, when: ansible_architecture == "x86_64" }
-
-     - tcwg-sys-add-user
-     - tcwg-sysctl
      - lab-sssd-access
-     - tcwg-stop-not-needed-services
+     - { role: tcwg-apt-repo-add, when: ansible_architecture == "x86_64" }
      - tcwg-apt-install
      - tcwg-docker
+     - tcwg-infra-sudo
+     - tcwg-iotop
+     - tcwg-noautoupdate
+     - tcwg-service-control
+     - tcwg-stop-not-needed-services
+     - tcwg-sys-add-user
+     - tcwg-sysctl