chef-vpc-toolkit 2.7.0 → 2.7.1

Sign up to get free protection for your applications and to get access to all the features.
data/CHANGELOG CHANGED
@@ -1,3 +1,6 @@
1
+ * Thu Oct 20 2011 Dan Prince <dan.prince@rackspace.com> - 2.7.1
2
+ - Support for image snapshots where chef is pre-installed.
3
+
1
4
  * Wed Oct 5 2011 Dan Prince <dan.prince@rackspace.com> - 2.7.0
2
5
  - Support for Fedora 15, Ubuntu 11.04, and Debian 6.0.
3
6
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.7.0
1
+ 2.7.1
@@ -243,17 +243,21 @@ done
243
243
 
244
244
  function start_chef_server {
245
245
 
246
- # Ubuntu starts the Chef server automatically
247
- if [ -f /bin/rpm ]; then
248
- /sbin/service couchdb start 1> /dev/null
249
- /sbin/chkconfig couchdb on
250
- /sbin/service rabbitmq-server start </dev/null &> /dev/null
251
- /sbin/chkconfig rabbitmq-server on
246
+ local SERVICE_BIN="/usr/sbin/service"
247
+ [ -f /bin/rpm ] && SERVICE_BIN="/sbin/service"
248
+
249
+ [ -d /var/run/chef ] && chown chef:chef /var/run/chef
250
+
251
+ if [ ! -f /var/run/chef/server.main.pid ]; then
252
+ $SERVICE_BIN couchdb start 1> /dev/null
253
+ /sbin/chkconfig couchdb on &> /dev/null
254
+ $SERVICE_BIN rabbitmq-server start </dev/null &> /dev/null
255
+ /sbin/chkconfig rabbitmq-server on &> /dev/null
252
256
 
253
257
  for svc in chef-solr chef-solr-indexer chef-server chef-server-webui
254
258
  do
255
- /sbin/service $svc start
256
- /sbin/chkconfig $svc on
259
+ $SERVICE_BIN $svc start
260
+ /sbin/chkconfig $svc on &> /dev/null
257
261
  done
258
262
  fi
259
263
 
@@ -261,9 +265,12 @@ function start_chef_server {
261
265
 
262
266
  function start_chef_client {
263
267
 
264
- /etc/init.d/chef-client start
268
+ local SERVICE_BIN="/usr/sbin/service"
269
+ [ -f /bin/rpm ] && SERVICE_BIN="/sbin/service"
270
+
271
+ $SERVICE_BIN chef-client start
265
272
  if [ -f /sbin/chkconfig ]; then
266
- chkconfig chef-client on
273
+ chkconfig chef-client on &> /dev/null
267
274
  fi
268
275
 
269
276
  }
@@ -0,0 +1,4 @@
1
+ #for unknown images we require that Chef is preinstalled
2
+ function install_chef {
3
+ return 0
4
+ }
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef-vpc-toolkit
3
3
  version: !ruby/object:Gem::Version
4
- hash: 19
4
+ hash: 17
5
5
  prerelease: false
6
6
  segments:
7
7
  - 2
8
8
  - 7
9
- - 0
10
- version: 2.7.0
9
+ - 1
10
+ version: 2.7.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-10-05 00:00:00 -04:00
18
+ date: 2011-10-21 00:00:00 -04:00
19
19
  default_executable: chef-vpc-toolkit
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -83,7 +83,6 @@ extensions: []
83
83
  extra_rdoc_files:
84
84
  - README.rdoc
85
85
  files:
86
- - .gitignore
87
86
  - .rvmrc
88
87
  - CHANGELOG
89
88
  - COPYING
@@ -122,6 +121,7 @@ files:
122
121
  - lib/chef-vpc-toolkit/chef_bootstrap/rhel.bash
123
122
  - lib/chef-vpc-toolkit/chef_bootstrap/ubuntu-opscode.bash
124
123
  - lib/chef-vpc-toolkit/chef_bootstrap/ubuntu.bash
124
+ - lib/chef-vpc-toolkit/chef_bootstrap/unknown.bash
125
125
  - lib/chef-vpc-toolkit/chef_installer.rb
126
126
  - lib/chef-vpc-toolkit/cloud-servers-vpc/client.rb
127
127
  - lib/chef-vpc-toolkit/cloud-servers-vpc/connection.rb
@@ -150,8 +150,8 @@ homepage: http://github.com/rackspace/chef-vpc-toolkit
150
150
  licenses: []
151
151
 
152
152
  post_install_message:
153
- rdoc_options:
154
- - --charset=UTF-8
153
+ rdoc_options: []
154
+
155
155
  require_paths:
156
156
  - lib
157
157
  required_ruby_version: !ruby/object:Gem::Requirement
@@ -179,11 +179,5 @@ rubygems_version: 1.3.7
179
179
  signing_key:
180
180
  specification_version: 3
181
181
  summary: Rake tasks to automate and configure server groups in the cloud with Chef.
182
- test_files:
183
- - test/client_test.rb
184
- - test/ssh_util_test.rb
185
- - test/server_group_test.rb
186
- - test/test_helper.rb
187
- - test/util_test.rb
188
- - test/server_test.rb
189
- - test/vpn_network_manager_test.rb
182
+ test_files: []
183
+
data/.gitignore DELETED
@@ -1,9 +0,0 @@
1
- tmp
2
-
3
- ## VIM
4
- *.swp
5
-
6
- ## PROJECT::GENERAL
7
- coverage
8
- rdoc
9
- pkg