vpn.rb in kontena-cli-0.7.0

- old
+ new

@@ -8,11 +8,11 @@
     def create(opts)
       require_api_url
       token = require_token
       preferred_node = opts.node
 
-      vpn = client(token).get("services/vpn") rescue nil
+      vpn = client(token).get("services/#{current_grid}/vpn") rescue nil
       raise ArgumentError.new('Vpn already exists') if vpn
 
       nodes = client(token).get("grids/#{current_grid}/nodes")
       if preferred_node.nil?
         node = nodes['nodes'].find{|n| n['connected']}
@@ -38,13 +38,13 @@
         cap_add: ['NET_ADMIN'],
         env: ["OVPN_SERVER_URL=udp://#{public_ip}:1194"],
         affinity: ["node==#{node['name']}"]
       }
       client(token).post("grids/#{current_grid}/services", data)
-      result = client(token).post("services/vpn/deploy", {})
+      result = client(token).post("services/#{current_grid}/vpn/deploy", {})
       print 'deploying '
-      until client(token).get("services/vpn")['state'] != 'deploying' do
+      until client(token).get("services/#{current_grid}/vpn")['state'] != 'deploying' do
         print '.'
         sleep 1
       end
       puts ' done'
       puts "OpenVPN service is now started (udp://#{public_ip}:1194)."
@@ -53,19 +53,19 @@
 
     def delete
       require_api_url
       token = require_token
 
-      vpn = client(token).get("services/vpn") rescue nil
+      vpn = client(token).get("services/#{current_grid}/vpn") rescue nil
       raise ArgumentError.new("VPN service does not exist") if vpn.nil?
 
-      client(token).delete("services/vpn")
+      client(token).delete("services/#{current_grid}/vpn")
     end
 
     def config
       require_api_url
       payload = {cmd: ['/usr/local/bin/ovpn_getclient', 'KONTENA_VPN_CLIENT']}
-      stdout, stderr = client(require_token).post("containers/vpn-1/exec", payload)
+      stdout, stderr = client(require_token).post("containers/#{current_grid}/vpn/vpn-1/exec", payload)
       puts stdout
     end
   end
 end