diff options
| author | elijah <elijah@riseup.net> | 2012-11-09 01:22:48 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2012-11-09 01:22:48 -0800 |
| commit | febeb64a801f3b4c72193bc93ee0400dee3a2a0a (patch) | |
| tree | a31d0efc4f9ef563c3f9e9023d09e9dfb8b954af /test | |
| parent | e0471e278c3baf7fc74f288281c7219cbcf0172c (diff) | |
vagrant support
Diffstat (limited to 'test')
| -rw-r--r-- | test/provider/common.json | 3 | ||||
| -rw-r--r-- | test/provider/nodes/couch1.json | 2 | ||||
| -rw-r--r-- | test/provider/nodes/vpn1.json | 2 | ||||
| -rw-r--r-- | test/provider/provider.json | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/test/provider/common.json b/test/provider/common.json index 7504e86..85a93cb 100644 --- a/test/provider/common.json +++ b/test/provider/common.json @@ -21,5 +21,6 @@ "use": false, "cert": "= x509.use ? file(:node_x509_cert) : nil", "key": "= x509.use ? file(:node_x509_key) : nil" - } + }, + "local": "= self.vagrant?" } diff --git a/test/provider/nodes/couch1.json b/test/provider/nodes/couch1.json index fe5d7e5..d246b99 100644 --- a/test/provider/nodes/couch1.json +++ b/test/provider/nodes/couch1.json @@ -1,4 +1,4 @@ { "services": "couchdb", - "ip_address": "245.2.45.42" + "ip_address": "10.5.5.2" }
\ No newline at end of file diff --git a/test/provider/nodes/vpn1.json b/test/provider/nodes/vpn1.json index 1c58a1b..5115cb2 100644 --- a/test/provider/nodes/vpn1.json +++ b/test/provider/nodes/vpn1.json @@ -1,6 +1,6 @@ { "services": "openvpn", - "ip_address": "2.2.2.2", + "ip_address": "10.5.5.3", "tags": "production", "openvpn": { "gateway_address": "3.3.3.3", diff --git a/test/provider/provider.json b/test/provider/provider.json index e65eebe..6e7618f 100644 --- a/test/provider/provider.json +++ b/test/provider/provider.json @@ -23,5 +23,8 @@ "bit_size": 3248, "life_span": "1y" } + }, + "vagrant":{ + "network":"10.5.5.0/24" } }
\ No newline at end of file |