travis-chef 0.0.2 → 0.0.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/script/travis-chef +18 -9
- data/travis-chef.gemspec +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2465bc849489862fb3b04428d01b8e4789cb9c14
|
|
4
|
+
data.tar.gz: 6c199c36ef4853c5aad235d8fb2d8093dfba7f6b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 149e76359ba1833390484812f6f1c36bed4797cd0b4b1b12177c3f0df2e952d68afc4e9effd7ec15fb6a1b2303a8124fbb36eed01f822391d0c395a910652d04
|
|
7
|
+
data.tar.gz: 5d8206f72efe82b55834fd3a1e4162aef181e3ef6f4739ba426dd0c2f8de0957ee7bdde746b8cd3eaa3f70db4bc170e9af0825d462e9f5243ff2e1a38e20f31a
|
data/script/travis-chef
CHANGED
|
@@ -30,21 +30,30 @@ setup_chef() {
|
|
|
30
30
|
# Load ssh key for knife
|
|
31
31
|
load_ssh_key || exit $?
|
|
32
32
|
|
|
33
|
+
if [ -n "${CHEF_VALIDATOR}" ]; then
|
|
34
|
+
CHEF_VALIDATOR="${PWD%/}/.travis-${CHEF_VALIDATOR}"
|
|
35
|
+
else
|
|
36
|
+
CHEF_VALIDATOR="$(echo ${PWD%/}/.travis-*-validator.pem)"
|
|
37
|
+
fi
|
|
38
|
+
|
|
33
39
|
# Determine Chef organization name from validator pem
|
|
34
|
-
CHEF_VALIDATOR="$(echo ${PWD%/}/.travis-*-validator.pem)"
|
|
35
40
|
CHEF_ORG="${CHEF_VALIDATOR##*/.travis-}"
|
|
36
41
|
CHEF_ORG="${CHEF_ORG%% }"
|
|
37
|
-
CHEF_ORG="${CHEF_ORG
|
|
42
|
+
CHEF_ORG="${CHEF_ORG%%-validator*}"
|
|
38
43
|
|
|
39
44
|
# Set CHEF_SERVER from CHEF_ORG unless provided from environment
|
|
40
45
|
CHEF_SERVER="${CHEF_SERVER:-https://api.opscode.com/organizations/${CHEF_ORG}}"
|
|
41
46
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
47
|
+
if [ -n "${CHEF_CLIENT}" ]; then
|
|
48
|
+
CHEF_CLIENT="${PWD%/}/.travis-${CHEF_CLIENT}"
|
|
49
|
+
else
|
|
50
|
+
# Determine Chef node name from client pem
|
|
51
|
+
CHEF_CLIENT="$(echo ${PWD%/}/.travis-*.pem)"
|
|
52
|
+
CHEF_CLIENT="${CHEF_CLIENT/${CHEF_VALIDATOR}/}"
|
|
53
|
+
CHEF_USER="${CHEF_CLIENT##*/.travis-}"
|
|
54
|
+
CHEF_USER="${CHEF_USER%% }"
|
|
55
|
+
CHEF_USER="${CHEF_USER%%.*}"
|
|
56
|
+
fi
|
|
48
57
|
|
|
49
58
|
# Configure knife and decrypt keys
|
|
50
59
|
[ -d "${PWD%/}/.chef" ] && rm -rf "${PWD%/}/.chef"
|
|
@@ -59,7 +68,7 @@ node_name '${CHEF_USER}'
|
|
|
59
68
|
client_key "#{current_dir}/${CHEF_USER}.pem"
|
|
60
69
|
validation_client_name '${CHEF_ORG}-validator'
|
|
61
70
|
validation_key "#{current_dir}/${CHEF_ORG}-validator.pem"
|
|
62
|
-
chef_server_url '
|
|
71
|
+
chef_server_url '${CHEF_SERVER}'
|
|
63
72
|
|
|
64
73
|
knife[:ssh_user] = '${CHEF_USER}'
|
|
65
74
|
knife[:ssh_identity_file] = '~/.ssh/id_rsa_travis'
|
data/travis-chef.gemspec
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: travis-chef
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Matt Kasa
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-06-
|
|
11
|
+
date: 2014-06-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies: []
|
|
13
13
|
description: Script to automate Chef deployments from Travis
|
|
14
14
|
email:
|