From 8c92d07533a7608cf7d753629e54e56bcb98fdaa Mon Sep 17 00:00:00 2001
From: Igor Lankin <dev@lankin.net>
Date: Tue, 22 Oct 2013 22:05:06 +0200
Subject: [PATCH] extracted public_key to config

---
 Vagrantfile                                      | 9 ++++++++-
 puppet/modules/system-base/files/id_rsa_4096.pub | 1 -
 puppet/modules/system-base/manifests/users.pp    | 3 +--
 3 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 puppet/modules/system-base/files/id_rsa_4096.pub

diff --git a/Vagrantfile b/Vagrantfile
index 5a696c3..58c45e8 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -7,6 +7,7 @@ Vagrant::Config.run do |config|
 
   username = 'vagrant'
   password = '$6$aqzOtgCM$OxgoMP4JoqMJ1U1F3MZPo2iBefDRnRCXSfgIM36E5cfMNcE7GcNtH1P/tTC2QY3sX3BxxJ7r/9ciScIVTa55l0'
+  public_key= ''
 
   if yml.has_key?('username')
     username = yml['username']
@@ -16,6 +17,11 @@ Vagrant::Config.run do |config|
     password = yml['password']
   end
 
+  if yml.has_key?('public_key')
+    public_key = yml['public_key']
+  end
+
+
   config.vm.define "gw" do |gw|
     gw.vm.box = "gw"
     gw.vm.host_name = "gw.dev"
@@ -30,7 +36,8 @@ Vagrant::Config.run do |config|
       puppet.facter = { 
         "fqdn" => "box.dev",
         'username' => username,
-        'password' => password
+        'password' => password,
+        'public_key' => public_key
       }
     end
 
diff --git a/puppet/modules/system-base/files/id_rsa_4096.pub b/puppet/modules/system-base/files/id_rsa_4096.pub
deleted file mode 100644
index fef3811..0000000
--- a/puppet/modules/system-base/files/id_rsa_4096.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAgEAujDtrbWU6PVvUzZ48sNYRz/Jxmvr47eJ0asHnG/UNBs5lUo/P260ZK9q8dowtxfrvKOW4u8sy49vZFF5C7yhrf6x7N8NymHcMoy7nSS0TYx85rALER1/oMqfwSZ+Suu3B64Tx+CG8hPmEfbqAB+jW995SP0JH7LvmSvLbli++kKRwLv0Iq7UUu1iXo0Qa0vaG/xHryG5J+cfYxz/m0hybPdiEXJ+aTGpiicz3/hTJ+ruNaygVHDm7zdi5rYXAnHQf5JhOGJBXzZ1eRuIrXYOKx1bIjmvta92iKFEXUCYTmQL9Oiqssm7ElQkcRcKuNiL7sIh6G+TmcIySX916SaAdwQ8PjqP01tEjROwv3cV/i+OygCgdqhVs4S16OqfKRMs5tKGh7TX5CtcXg5zR9L9u0C+rMpyy2gK0+s5VzHfUCQgsYq7Ktss1j9GjSaQ0qq3sqeSCri4zleMxDsoXdesYZMpjx9jeAeJ5I+xc4AS3OtvCP4JaPZ5G7l8sfxF4jdDoXbWJ5kjd0+Hs2pUCJdXbmPsF1XV4FlyeseLRwXcOezrtG9/gFmNlDJHQx+K/p0uP+VnYauVWQQgVeag/plttSV4T7l5xkfUKmP82P21Bg2xYU/bXGeOqwWxYYMLdiASLz9rPMJUdJ2yNpn4mJCPH+0ac3beBvav0ay4Hhr4htk= bja - 20101205
\ No newline at end of file
diff --git a/puppet/modules/system-base/manifests/users.pp b/puppet/modules/system-base/manifests/users.pp
index 94997ca..1f4ad64 100644
--- a/puppet/modules/system-base/manifests/users.pp
+++ b/puppet/modules/system-base/manifests/users.pp
@@ -1,7 +1,6 @@
 
 class system-base::users {
 
-  $password   = '$6$1OK3l7RB$QPsWNzK0A9JnwBn9rGohmp58XPrg6SvKFBLrRXSO30933or6qQjd1D2DZZL/IkpkbqQYjNSyZ/liwCX3qiqVT/'
   user { $username:
     ensure     => "present",
     shell      => '/bin/bash',
@@ -27,7 +26,7 @@
   }
 
   file {"/home/$username/.ssh/authorized_keys":
-    source  => "puppet:///modules/system-base/id_rsa_4096.pub",
+    content => $public_key,
     owner   => $username,
     group   => $username,
     mode    => 600,