diff options
| author | varac <varacanero@zeromail.org> | 2016-07-16 18:19:58 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-07-16 19:59:05 +0200 |
| commit | 3e36abee5e0b2a4017da473fae97eff281989115 (patch) | |
| tree | 97be6e84c21f0dfb7c932456ed51778af0b17821 | |
| parent | f31d974b33bf8ac760ae1ba56c583081f51f7bce (diff) | |
Add catalogtest node, remove single node
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | tests/puppet/hiera.yaml | 2 | ||||
| -rw-r--r-- | tests/puppet/provider/nodes/catalogtest.json (renamed from tests/puppet/provider/nodes/single.json) | 5 | ||||
| -rw-r--r-- | tests/puppet/provider/tags/catalogtest.json | 1 |
4 files changed, 9 insertions, 3 deletions
@@ -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/single.json b/tests/puppet/provider/nodes/catalogtest.json index ca358cc5..4f86ac19 100644 --- a/tests/puppet/provider/nodes/single.json +++ b/tests/puppet/provider/nodes/catalogtest.json @@ -1,9 +1,10 @@ { - "ip_address": "10.5.5.101", + "ip_address": "1.1.1.1", "services": [ "couchdb", "mx", "soledad", "webapp" - ] + ], + "tags": ["catalogtest"] } 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 @@ +{} |