From 70a0a7cbf9710a79685cd88fdbb906293b0dbd8d Mon Sep 17 00:00:00 2001
From: Niko Kurtti <niko.kurtti@shopify.com>
Date: Sun, 29 Mar 2015 10:31:12 +0300
Subject: [PATCH] newrelic sysmond on the host, remove container

---
 .gitignore                                 |   1 +
 .gitmodules                                |   3 +++
 base.yml                                   |   3 ++-
 roles/newrelic                             |   1 +
 roles/newrelic_container/.DS_Store         | Bin 6148 -> 0 bytes
 roles/newrelic_container/defaults/main.yml |   8 --------
 roles/newrelic_container/tasks/main.yml    |   4 ----
 vars/newrelic_key.yml                      |   9 +++++++++
 8 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 roles/newrelic
 delete mode 100644 roles/newrelic_container/.DS_Store
 delete mode 100644 roles/newrelic_container/defaults/main.yml
 delete mode 100644 roles/newrelic_container/tasks/main.yml
 create mode 100644 vars/newrelic_key.yml

diff --git a/.gitignore b/.gitignore
index b585e65..e47ea3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .vagrant
 vagrant_ansible_inventory*
 files/ssl/*.key
+.DS_Store
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..dc02f9e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "roles/newrelic"]
+	path = roles/newrelic
+	url = git@github.com:sivel/ansible-newrelic.git
diff --git a/base.yml b/base.yml
index 3be0b25..fe64c39 100644
--- a/base.yml
+++ b/base.yml
@@ -6,12 +6,13 @@
   vars_files:
     - vars/users.yml
     - vars/ejson_key.yml
+    - vars/newrelic_key.yml
     - roles/koodiklinikka.fi/defaults/main.yml
     - roles/koodiklinikka.fi-api/defaults/main.yml
   roles:
     - base
     - docker
     - nginx
-    - newrelic_container
+    - newrelic
   tasks:
     - include: tasks/webuser.yml
diff --git a/roles/newrelic b/roles/newrelic
new file mode 160000
index 0000000..0c50972
--- /dev/null
+++ b/roles/newrelic
@@ -0,0 +1 @@
+Subproject commit 0c50972c4f4d5de0053a3f5172f32e2a497f3d82
diff --git a/roles/newrelic_container/.DS_Store b/roles/newrelic_container/.DS_Store
deleted file mode 100644
index 344932c79e10d89f69fc8a68dc8e3f2d7e5cd903..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKOH0E*5Z>)WQ@z9&2wwIo^w22PdW%($LZQ+kR%${5T`WmyQj3&A&i)MFKSL1x
z5B?Ny&OR)b>cxXdnSq&ac6MjOd<(l7LI^GQJc|&M5MqD|Oy$6QBVu0YgrszY0)oOG
zk=u_tZaZ`*)?(m)G9b<_OJd@Xh@6j|-@Dss^C&J9-e@YF$<E9gxj8B3!s2PQ751yK
z6ZfLB(>;+R?)k3vD^A?{^pC=@J@Os5#{GWNT;2<V*x`ZS{gT?K^S}%H<**lcQKPE%
zt8*`IHO-Yu*S~<&iWB%X9&wkqd3>3Z(ll2GgW^`6SypM7X9LUH-pI4k=FV_vJ{iW^
zdU5ygxHG)EzPY`-e|UU;Q71t~=|YwijO^>kLkAf^29SX%Wk6qm#{87lhh-rH$iVLz
z5cdNE6=-Wr6w0dujBEh_GZ2;nzUU=H4%29BOccTl2vw<oDwXOMgQ|3hGri8%m?%`~
zgzDyl>Mv8>p-}mC*q_PegxU(xA_K_4I0I=lG{yUW@N@q^o`fT002!Dn254r#x?hHp
z^xHa7oOo*)=ozRGu`W?KN&!bc#jsX9#jBuFAkKsXXlqOqLIebV1SAb;kbysC-~-eU
BUk?BP

diff --git a/roles/newrelic_container/defaults/main.yml b/roles/newrelic_container/defaults/main.yml
deleted file mode 100644
index ea79f9b..0000000
--- a/roles/newrelic_container/defaults/main.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35363731316437353333383261313965613436353833633161656135313939343137316136396266
-3963653938303161316536636234303839336565613536660a626564366132653262393032323562
-33383931623037623034626362346266333639353862323235306236656465316536643535363232
-3361366665373566330a623361633166313962366365303962636564303737316538366232366361
-37623434313136376461653137346634653633336431663737663335376133623866663530643435
-37363961646534336163346532663634656334666363306235346363383031376161636433383065
-376139346530336632386230373838383439
diff --git a/roles/newrelic_container/tasks/main.yml b/roles/newrelic_container/tasks/main.yml
deleted file mode 100644
index 3b5e784..0000000
--- a/roles/newrelic_container/tasks/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- name: Start the container
-  shell: docker run --restart=always -d -e NEW_RELIC_LICENSE_KEY={{ newrelic_key }} --name newrelic_sysmond --hostname `hostname` uzyexe/newrelic 
diff --git a/vars/newrelic_key.yml b/vars/newrelic_key.yml
new file mode 100644
index 0000000..39d470a
--- /dev/null
+++ b/vars/newrelic_key.yml
@@ -0,0 +1,9 @@
+$ANSIBLE_VAULT;1.1;AES256
+62646665643832663736393931373639616338393736333332323735373737653931303163343539
+3637303661643031616633613834646665653537623062360a326265343266643536393366323938
+62646664663831393561393031643432646431303036353562363236383230663231653461323161
+3264353463366135650a636336356265626332643262363036666664323366363530366337623663
+64323762623662366136383834653235666639363664386462616363623730366238336530396663
+63353062616263376130653836366266383664626531333863336364343063656437383562333635
+38376136326337643139373336643932376232386265326364396665633139623930303134633030
+33333935343537356336