From b23f857c6c87c288d8db4c1f4b98bbdc0e3ac724 Mon Sep 17 00:00:00 2001
From: Charles Wyble <charles@turnsys.com>
Date: Sun, 24 Feb 2019 10:21:11 -0600
Subject: [PATCH] updated inventory

---
 rundeck/tsys-nodes              | 55 ++++++++++++++++-----------------
 scripts/auto-netdata-install.sh |  3 +-
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/rundeck/tsys-nodes b/rundeck/tsys-nodes
index 0566aee..67eb111 100644
--- a/rundeck/tsys-nodes
+++ b/rundeck/tsys-nodes
@@ -18,21 +18,26 @@ rackrental-app.turnsys.net:
   username: root
   ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
   tags: 'prod,ovh,rr'
-ovh-vmsrv.turnsys.net:
-  hostname: ovh-vmsrv.turnsys.net
+pfv-time.pfv.turnsys.net:
+  hostname: pfv-time.pfv.turnsys.net
   username: root
   ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
-  tags: 'prod,ovh,rr'
+  tags: 'pfv,physical,infra'
+pfv-power.pfv.turnsys.net:
+  hostname: pfv-power.pfv.turnsys.net
+  username: root
+  ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
+  tags: 'pfv,physical,infra'
 pfv-stor.pfv.turnsys.net:
   hostname: pfv-stor.pfv.turnsys.net
   username: root
   ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
-  tags: 'pfv,physical,infra,tsys'
-pfv-ucs.turnsys.net:
-  hostname: pfv-ucs.turnsys.net
+  tags: 'pfv,physical,infra'
+pfv-stor1.pfv.turnsys.net:
+  hostname: pfv-stor.pfv.turnsys.net
   username: root
   ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
-  tags: 'pfv,vm,infra,tsys'
+  tags: 'pfv,physical,infra'
 pfv-rrsvr.pfv.turnsys.net:
   hostname: pfv-rrsvr.pfv.turnsys.net
   username: root
@@ -43,27 +48,6 @@ subo-devlab.pfv.turnsys.net:
   username: root
   ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
   tags: 'pfv,physical,infra,subo'
-pfv-doorman.pfv.turnsys.net:
-  hostname: doorman.pfv.turnsys.net
-  username: root
-  ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
-  tags: 'pfv,physical,infra'
-pfv-time.pfv.turnsys.net:
-  hostname: pfv-time.pfv.turnsys.net
-  username: root
-  ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
-  tags: 'pfv,physical,infra'
-pfv-rrsvr.pfv.turnsys.net:
-  hostname: pfv-rrsvr.pfv.turnsys.net
-  username: root
-  ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
-  tags: 'pfv,physical,infra'
-eveng-dev.pfv.turnsys.net:
-  hostname: eveng-dev.pfv.turnsys.net
-  username: root
-  ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
-  tags: 'prod,ovh,rr'
-
 subo1pm.pfv.turnsys.net:
   hostname: subo1pm.pfv.turnsys.net
   username: root
@@ -79,3 +63,18 @@ subo2ob.pfv.turnsys.net:
   username: root
   ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
   tags: 'pfv,physical,subo'
+pfv-doorman.pfv.turnsys.net:
+  hostname: doorman.pfv.turnsys.net
+  username: root
+  ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
+  tags: 'pfv,physical,infra'
+pfv-ucs.turnsys.net:
+  hostname: pfv-ucs.turnsys.net
+  username: root
+  ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
+  tags: 'pfv,vm,infra,tsys'
+eveng-dev.pfv.turnsys.net:
+  hostname: eveng-dev.pfv.turnsys.net
+  username: root
+  ssh-keypath: /var/lib/rundeck/ssh-keys/service-key
+  tags: 'prod,ovh,rr'
diff --git a/scripts/auto-netdata-install.sh b/scripts/auto-netdata-install.sh
index e20a12d..ac0d127 100755
--- a/scripts/auto-netdata-install.sh
+++ b/scripts/auto-netdata-install.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-curl -Ss 'https://raw.githubusercontent.com/netdata/netdata-demo-site/master/install-required-packages.sh' >/tmp/kickstart.sh && bash /tmp/kickstart.sh --dont-wait -i netdata-all
+curl -Ss 'https://raw.githubusercontent.com/netdata/netdata-demo-site/master/install-required-packages.sh' >/tmp/kickstart.sh 
+bash /tmp/kickstart.sh --dont-wait -i netdata-all
 bash <(curl -Ss https://my-netdata.io/kickstart.sh) --dont-wait