From 51a1e1c6db33ed2868ec74728f854237e3dfd86a Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 21 Oct 2014 15:14:23 -0700 Subject: update platform to take advantage of new platform.rb. requires leap_cli 1.6 --- platform.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'platform.rb') diff --git a/platform.rb b/platform.rb index 270dd25a..35017559 100644 --- a/platform.rb +++ b/platform.rb @@ -5,15 +5,24 @@ Leap::Platform.define do self.version = "0.5.4.1" - self.compatible_cli = "1.5.8".."1.99" + self.compatible_cli = "1.6.0".."1.99" # # the facter facts that should be gathered # self.facts = ["ec2_local_ipv4", "ec2_public_ipv4"] + # + # absolute paths on the destination server + # + self.hiera_path = '/etc/leap/hiera.yaml' + self.leap_dir = '/srv/leap' + self.files_dir = '/srv/leap/files' + self.init_path = '/srv/leap/initialized' + # # the named paths for this platform + # (relative to the provider directory) # self.paths = { # directories @@ -43,6 +52,11 @@ Leap::Platform.define do :soledad_service_json_template => 'files/service-definitions/#{arg}/soledad-service.json.erb', :smtp_service_json_template => 'files/service-definitions/#{arg}/smtp-service.json.erb', + # custom puppet + :custom_puppet_dir => 'files/puppet', + :custom_puppet_modules_dir => 'files/puppet/modules', + :custom_puppet_manifests_dir => 'files/puppet/manifests', + # output files :facts => 'facts.json', :user_ssh => 'users/#{arg}/#{arg}_ssh.pub', @@ -85,5 +99,7 @@ Leap::Platform.define do self.monitor_username = 'monitor' self.reserved_usernames = ['monitor'] + + self.default_puppet_tags = ['leap_base','leap_service'] end -- cgit v1.2.3 From b76445c07688ba1b4e8940189f8538a741de92d4 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 21 Oct 2014 20:27:06 -0400 Subject: modify the leap repository contents so they pick the correct repository, based on the hiera value 'major_version' (#6251) Change-Id: I10532ef83e3aa2d35d9c0be241952a35e366bba4 --- platform.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'platform.rb') diff --git a/platform.rb b/platform.rb index 35017559..06a49b7e 100644 --- a/platform.rb +++ b/platform.rb @@ -4,7 +4,7 @@ # Leap::Platform.define do - self.version = "0.5.4.1" + self.version = "0.6" self.compatible_cli = "1.6.0".."1.99" # -- cgit v1.2.3 From 1d4670f8b9b4c1f3d4cd8017a3f6145ccdd41312 Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 31 Oct 2014 00:01:57 -0700 Subject: add support for property tor.key --- platform.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'platform.rb') diff --git a/platform.rb b/platform.rb index 06a49b7e..c37b6d29 100644 --- a/platform.rb +++ b/platform.rb @@ -5,7 +5,7 @@ Leap::Platform.define do self.version = "0.6" - self.compatible_cli = "1.6.0".."1.99" + self.compatible_cli = "1.6.1".."1.99" # # the facter facts that should be gathered @@ -77,10 +77,12 @@ Leap::Platform.define do :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', + :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', + :node_tor_priv_key => 'files/nodes/#{arg}/tor.key', + :node_tor_pub_key => 'files/nodes/#{arg}/tor.pub', # testing files :test_client_key => 'test/cert/client.key', -- cgit v1.2.3