Fix chef-server-url, bump version

eucalyptus · Aug 16, 2014 · 1c70271 · 1c70271
1 parent 3f5cac6
commit 1c70271
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -1 +1,2 @@
-default['deployer']['chef-server'] = 'https://10.111.4.101'
+default['deployer']['chef-server-url'] = 'https://10.111.4.101'
+default['deployer']['default-password'] = 'foobar'
diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license          'Apache 2'
 description      'Installs/Configures Deployer jenkins instance'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.0'
+version          '0.1.1'
 depends  'python'
 depends  'rbenv'
 depends  'ntp'
diff --git a/templates/default/knife.erb b/templates/default/knife.erb
@@ -4,5 +4,5 @@ node_name                'admin'
 client_key               '/etc/chef-server/admin.pem'
 validation_client_name   'chef-validator'
 validation_key           '/etc/chef-server/chef-validator.pem'
-chef_server_url          '<%= node['deployer']['chef-server'] %>'
+chef_server_url          '<%= node['deployer']['chef-server-url'] %>'
 cookbook_path            '/root/cookbooks'
diff --git a/templates/default/motherbrain.erb b/templates/default/motherbrain.erb
@@ -13,7 +13,7 @@
   },
   "ssh": {
     "user": "root",
-    "password": "foobar",
+    "password": "<%= node['deployer']['default-password'] %>",
     "keys": ["/root/.ssh/id_rsa"],
     "sudo": false,
     "timeout": 10.0,