From 3e36abee5e0b2a4017da473fae97eff281989115 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sat, 16 Jul 2016 18:19:58 +0200
Subject: Add catalogtest node, remove single node

---
 .gitignore                                   |  4 ++++
 tests/puppet/hiera.yaml                      |  2 +-
 tests/puppet/provider/nodes/catalogtest.json | 10 ++++++++++
 tests/puppet/provider/nodes/single.json      |  9 ---------
 tests/puppet/provider/tags/catalogtest.json  |  1 +
 5 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 tests/puppet/provider/nodes/catalogtest.json
 delete mode 100644 tests/puppet/provider/nodes/single.json
 create mode 100644 tests/puppet/provider/tags/catalogtest.json

diff --git a/.gitignore b/.gitignore
index 7f9f2138..9f24fd63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,10 @@
 /tests/puppet/provider/secrets.json
 /tests/puppet/provider/files/ssh/authorized_keys
 /tests/puppet/provider/files/nodes/
+/tests/puppet/provider/nodes/*
+!/tests/puppet/provider/nodes/catalogtest.json
+/tests/puppet/provider/tags/*
+!/tests/puppet/provider/tags/catalogtest.json
 /tests/puppet/provider/users/*
 !/tests/puppet/provider/users/gitlab-runner
 !/tests/puppet/provider/users/gitlab-runner/*
diff --git a/tests/puppet/hiera.yaml b/tests/puppet/hiera.yaml
index 45a2549b..d4d0f670 100644
--- a/tests/puppet/hiera.yaml
+++ b/tests/puppet/hiera.yaml
@@ -9,7 +9,7 @@
    :datadir: tests/puppet/provider/hiera
 
 :hierarchy:
-  - single
+  - catalogtest
 
 :puppet:
    :datasource: data
diff --git a/tests/puppet/provider/nodes/catalogtest.json b/tests/puppet/provider/nodes/catalogtest.json
new file mode 100644
index 00000000..4f86ac19
--- /dev/null
+++ b/tests/puppet/provider/nodes/catalogtest.json
@@ -0,0 +1,10 @@
+{
+  "ip_address": "1.1.1.1",
+  "services": [
+    "couchdb",
+    "mx",
+    "soledad",
+    "webapp"
+  ],
+  "tags": ["catalogtest"]
+}
diff --git a/tests/puppet/provider/nodes/single.json b/tests/puppet/provider/nodes/single.json
deleted file mode 100644
index ca358cc5..00000000
--- a/tests/puppet/provider/nodes/single.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ip_address": "10.5.5.101",
-  "services": [
-    "couchdb",
-    "mx",
-    "soledad",
-    "webapp"
-  ]
-}
diff --git a/tests/puppet/provider/tags/catalogtest.json b/tests/puppet/provider/tags/catalogtest.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/tests/puppet/provider/tags/catalogtest.json
@@ -0,0 +1 @@
+{}
-- 
cgit v1.2.3