summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/leap_cli/config/object.rb1
-rw-r--r--test/leap_platform/provider_base/common.json2
-rw-r--r--test/provider/tags/local.json3
3 files changed, 5 insertions, 1 deletions
diff --git a/lib/leap_cli/config/object.rb b/lib/leap_cli/config/object.rb
index 70834a5..6f0342e 100644
--- a/lib/leap_cli/config/object.rb
+++ b/lib/leap_cli/config/object.rb
@@ -1,5 +1,6 @@
require 'erb'
require 'json/pure' # pure ruby implementation is required for our sorted trick to work.
+require 'ipaddr'
$KCODE = 'UTF8' unless RUBY_VERSION > "1.9.0"
require 'ya2yaml' # pure ruby yaml
diff --git a/test/leap_platform/provider_base/common.json b/test/leap_platform/provider_base/common.json
index f355780..3d44269 100644
--- a/test/leap_platform/provider_base/common.json
+++ b/test/leap_platform/provider_base/common.json
@@ -21,5 +21,5 @@
"cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap update-cert`') : nil",
"key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap update-cert`') : nil"
},
- "local": "= self.vagrant?"
+ "local": false
}
diff --git a/test/provider/tags/local.json b/test/provider/tags/local.json
new file mode 100644
index 0000000..3fb2bba
--- /dev/null
+++ b/test/provider/tags/local.json
@@ -0,0 +1,3 @@
+{
+ "local": true
+}