summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-04-12 10:39:06 -0700
committerelijah <elijah@riseup.net>2016-04-12 10:39:06 -0700
commit53fdac31bce3a66b37811dbe81e3d3f71c533a0c (patch)
treea18a473590c19c3190519f5f84b7d08effb04613
parent20025a9dba9385e9e02af9fda085a0dcf7a3f800 (diff)
fix node seeding (closes #8026)
-rw-r--r--lib/leap_cli/commands/node.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/leap_cli/commands/node.rb b/lib/leap_cli/commands/node.rb
index 142c0766..a23661b3 100644
--- a/lib/leap_cli/commands/node.rb
+++ b/lib/leap_cli/commands/node.rb
@@ -29,7 +29,7 @@ module LeapCli; module Commands
assert_files_missing! [:node_config, name]
# create and seed new node
- node = Config::Node.new(manager)
+ node = Config::Node.new(manager.env)
if options[:local]
node['ip_address'] = pick_next_vagrant_ip_address
end
@@ -118,7 +118,6 @@ module LeapCli; module Commands
# values in the template will not override existing node values.
#
def seed_node_data_from_template(node)
- return unless manager.respond_to?(:template)
node.inherit_from!(manager.template('common'))
[node['services']].flatten.each do |service|
if service