diff options
author | elijah <elijah@riseup.net> | 2015-05-05 15:24:09 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2015-05-05 15:24:09 -0700 |
commit | 55f1d27098365c772c23526c111fd9b20f34e645 (patch) | |
tree | eb9ae2abbce05a9de40c91ff14fcaf4d496dbba4 /provider_base | |
parent | 81e4dde40f8ad483df0c6ba87da1a3ba480eb7f4 (diff) |
take advantage of improved environment binding in leap_cli (requires v 1.7.1)
Diffstat (limited to 'provider_base')
-rw-r--r-- | provider_base/files/service-definitions/provider.json.erb | 2 | ||||
-rw-r--r-- | provider_base/lib/macros/nodes.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb index 2d0a5886..be8ae484 100644 --- a/provider_base/files/service-definitions/provider.json.erb +++ b/provider_base/files/service-definitions/provider.json.erb @@ -7,7 +7,7 @@ hsh['domain'] = domain.full_suffix # advertise services that are 'user services' and for which there are actually nodes - hsh['services'] ||= global.env(environment).services[:service_type => :user_service].field(:name).select do |service| + hsh['services'] ||= global.services[:service_type => :user_service].field(:name).select do |service| nodes_like_me[:services => service].any? end diff --git a/provider_base/lib/macros/nodes.rb b/provider_base/lib/macros/nodes.rb index 0c6668a0..8b961cbc 100644 --- a/provider_base/lib/macros/nodes.rb +++ b/provider_base/lib/macros/nodes.rb @@ -15,10 +15,10 @@ module LeapCli end # - # grab an environment appropriate provider + # simple alias for global.provider # def provider - global.env(@node.environment).provider + global.provider end # |