stacksondeck 1.0.9 → 1.0.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/stacksondeck/app.rb +6 -13
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3f66f37dd14473800a167656562303d6535266f9
|
|
4
|
+
data.tar.gz: 3ab570735e3e1e9147053170145f5cf3b64892ea
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 668f029bf4253411e1069126729fb0b75913ed22cf22cf9c07e2a42d690a7ee868d4fc7d9adaf7b00bd5a3d88e5b66740a2eab998419838842b88f7aab39c0b2
|
|
7
|
+
data.tar.gz: 9e177ac38b433a46c479c88674c44d7743cd20d7d883b9ba5111bebb14b098a9a19716ce2763e519b45105dfde794f82beb7cf3ee40ac838ad82251a9b20c384
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.0.
|
|
1
|
+
1.0.10
|
data/lib/stacksondeck/app.rb
CHANGED
|
@@ -60,6 +60,7 @@ module StacksOnDeck
|
|
|
60
60
|
@@db = Daybreak::DB.new settings.database
|
|
61
61
|
@@db_dump = YAML.dump db_copy
|
|
62
62
|
@@last_modified = Time.now
|
|
63
|
+
@@ridley = Ridley.from_chef_config settings.config
|
|
63
64
|
end
|
|
64
65
|
|
|
65
66
|
|
|
@@ -73,11 +74,7 @@ module StacksOnDeck
|
|
|
73
74
|
def self.refresh!
|
|
74
75
|
started = Time.now
|
|
75
76
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
chef_server_url = ridley.server_url
|
|
79
|
-
|
|
80
|
-
nodes = ridley.partial_search :node, 'name:*', %w[
|
|
77
|
+
nodes = @@ridley.partial_search :node, 'name:*', %w[
|
|
81
78
|
name
|
|
82
79
|
hostname
|
|
83
80
|
fqdn
|
|
@@ -95,9 +92,10 @@ module StacksOnDeck
|
|
|
95
92
|
nodes.each do |n|
|
|
96
93
|
name = n.name
|
|
97
94
|
n = n.automatic
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
95
|
+
|
|
96
|
+
username = settings.username
|
|
97
|
+
remoteUrl = File.join @@ridley.server_url, 'nodes', name
|
|
98
|
+
editUrl = File.join remoteUrl, 'edit'
|
|
101
99
|
|
|
102
100
|
tags = n.tags || []
|
|
103
101
|
tags += n.roles || []
|
|
@@ -107,7 +105,6 @@ module StacksOnDeck
|
|
|
107
105
|
next if n.hostname.nil?
|
|
108
106
|
|
|
109
107
|
node_resources[name] = {
|
|
110
|
-
'nodename' => name,
|
|
111
108
|
'hostname' => n.hostname,
|
|
112
109
|
'description' => n.fqdn,
|
|
113
110
|
'osArch' => n.kernel.machine,
|
|
@@ -133,10 +130,6 @@ module StacksOnDeck
|
|
|
133
130
|
log.info event: 'refreshed!', elapsed: (Time.now - started)
|
|
134
131
|
|
|
135
132
|
return node_resources
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
rescue Celluloid::Task::TerminatedError
|
|
139
|
-
# nop
|
|
140
133
|
end
|
|
141
134
|
|
|
142
135
|
|