now we require a leap_platform/platform.rb config file.

1 files changed, 2 insertions, 64 deletions

diff --git a/lib/leap_cli/path.rb b/lib/leap_cli/path.rb
index 4b17d45..b705788 100644
--- a/lib/leap_cli/path.rb
+++ b/lib/leap_cli/path.rb
@@ -2,68 +2,6 @@ require 'fileutils'
 
 module LeapCli; module Path
 
-  #
-  # all the named paths, relative to provider directory.
-  #
-  NAMED_PATHS = {
-    # directories
-    :hiera_dir        => 'hiera',
-    :files_dir        => 'files',
-    :nodes_dir        => 'nodes',
-    :services_dir     => 'services',
-    :tags_dir         => 'tags',
-    :node_files_dir   => 'files/nodes/#{arg}',
-
-    # input config files
-    :common_config    => 'common.json',
-    :provider_config  => 'provider.json',
-    :secrets_config   => 'secrets.json',
-    :node_config      => 'nodes/#{arg}.json',
-    :service_config   => 'services/#{arg}.json',
-    :tag_config       => 'tags/#{arg}.json',
-
-    # input templates
-    :provider_json_template => 'files/service-definitions/provider.json.erb',
-    :eip_service_json_template => 'files/service-definitions/#{arg}/eip-service.json.erb',
-    :soledad_service_json_template => 'files/service-definitions/#{arg}/soledad-service.json.erb',
-    :smtp_service_json_template => 'files/service-definitions/#{arg}/smtp-service.json.erb',
-
-    # output files
-    :user_ssh         => 'users/#{arg}/#{arg}_ssh.pub',
-    :user_pgp         => 'users/#{arg}/#{arg}_pgp.pub',
-    :known_hosts      => 'files/ssh/known_hosts',
-    :authorized_keys  => 'files/ssh/authorized_keys',
-    :ca_key           => 'files/ca/ca.key',
-    :ca_cert          => 'files/ca/ca.crt',
-    :client_ca_key    => 'files/ca/client_ca.key',
-    :client_ca_cert   => 'files/ca/client_ca.crt',
-    :dh_params        => 'files/ca/dh.pem',
-    :commercial_key   => 'files/cert/#{arg}.key',
-    :commercial_csr   => 'files/cert/#{arg}.csr',
-    :commercial_cert  => 'files/cert/#{arg}.crt',
-    :commercial_ca_cert  => 'files/cert/commercial_ca.crt',
-    :vagrantfile         => 'test/Vagrantfile',
-
-    # node output files
-    :hiera            => 'hiera/#{arg}.yaml',
-    :node_ssh_pub_key => 'files/nodes/#{arg}/#{arg}_ssh.pub',
-    :node_x509_key    => 'files/nodes/#{arg}/#{arg}.key',
-    :node_x509_cert   => 'files/nodes/#{arg}/#{arg}.crt',
-
-    # testing files
-    :test_client_key     => 'test/cert/client.key',
-    :test_client_cert    => 'test/cert/client.crt',
-    :test_openvpn_config => 'test/openvpn/#{arg}.ovpn',
-    :test_client_openvpn_template => 'test/openvpn/client.ovpn.erb'
-  }
-
-  #
-  # paths that take node name as the argument
-  #
-  NODE_PATHS = [
-    :node_config, :hiera, :node_x509_cert, :node_x509_key, :node_ssh_pub_key
-  ]
-
   def self.platform
     @platform
   end
@@ -122,8 +60,8 @@ module LeapCli; module Path
     end
 
     if name.is_a? Symbol
-      Util::assert!(NAMED_PATHS[name], "Error, I don't know the path for :#{name} (with argument '#{arg}')")
-      filename = eval('"' + NAMED_PATHS[name] + '"')
+      Util::assert!(Leap::Platform.paths[name], "Error, I don't know the path for :#{name} (with argument '#{arg}')")
+      filename = eval('"' + Leap::Platform.paths[name] + '"')
       return provider_dir + '/' + filename
     else
       return name