From c76221182ca98ed804cc0c5259982250fa45f67c Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 28 Nov 2012 01:40:20 -0800 Subject: give the user a nice error if 'init-node' has not yet been run (or if there are required packages that are missing). --- lib/leap_cli/remote/tasks.rb | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'lib/leap_cli/remote/tasks.rb') diff --git a/lib/leap_cli/remote/tasks.rb b/lib/leap_cli/remote/tasks.rb index 4a29517..ef41cb0 100644 --- a/lib/leap_cli/remote/tasks.rb +++ b/lib/leap_cli/remote/tasks.rb @@ -9,30 +9,23 @@ MAX_HOSTS = 10 task :install_authorized_keys, :max_hosts => MAX_HOSTS do leap.log :updating, "authorized_keys" do - run 'mkdir -p /root/.ssh && chmod 700 /root/.ssh' + leap.mkdirs '/root/.ssh' upload LeapCli::Path.named_path(:authorized_keys), '/root/.ssh/authorized_keys', :mode => '600' end end task :install_prerequisites, :max_hosts => MAX_HOSTS do - packages = "puppet ruby-hiera-puppet rsync lsb-release" - run "mkdir -p #{puppet_destination}" + leap.mkdirs puppet_destination leap.log :updating, "package list" do run "apt-get update" end leap.log :installing, "required packages" do - run "DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Options::=--force-confold install #{packages}" + run "DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Options::=--force-confold install #{leap.required_packages}" end + leap.mkdirs("/etc/leap", "/srv/leap") + leap.mark_initialized end -#task :update_platform, :max_hosts => MAX_HOSTS do -# puppet.update_code -#end - -#task :mk_leap_dir, :max_hosts => MAX_HOSTS do -# run 'mkdir -p /root/leap/config && chown -R root /root/leap && chmod -R ag-rwx,u+rwX /root/leap' -#end - task :apply_puppet, :max_hosts => MAX_HOSTS do raise "now such directory #{puppet_source}" unless File.directory?(puppet_source) leap.log :applying, "puppet" do -- cgit v1.2.3