dev-lxc 1.6.2 → 1.6.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +12 -0
- data/README.md +5 -7
- data/lib/dev-lxc/cli.rb +29 -24
- data/lib/dev-lxc/cluster.rb +8 -7
- data/lib/dev-lxc/server.rb +9 -1
- data/lib/dev-lxc/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f1a4805d460555cf0c64c63c32b6ba18be490b42
|
4
|
+
data.tar.gz: 51aee814b7dab8bb786ac95fc3def208845d873e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4c83ee825bd77d2fff383af3f2bc7f32df9467a6c6941678f17dea8c140f372b5671baf1cb9a5b956bd32c209dc8851e593f5145e78b9c4f34f13b052b559c29
|
7
|
+
data.tar.gz: 20208edfcc2cd3b4278f64e62772ae9fbbd9043fc93f453a0d9e716edb825ec1a56d772fea7c88f703e54c3da687d5d71bb5437f67c961ba72ca75dcc5d73cbe
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,17 @@
|
|
1
1
|
# dev-lxc Change Log
|
2
2
|
|
3
|
+
## 1.6.3 (2016-05-04)
|
4
|
+
|
5
|
+
* Put adhoc servers at the end of the servers list
|
6
|
+
|
7
|
+
* Only destroy a shared image if it has a name
|
8
|
+
|
9
|
+
* Auto accept license agreements
|
10
|
+
|
11
|
+
* Define default package names more cleanly
|
12
|
+
|
13
|
+
* Minor update to README.md
|
14
|
+
|
3
15
|
## 1.6.2 (2016-04-21)
|
4
16
|
|
5
17
|
* Sync SSH public keys to /home/dev-lxc/.ssh/authorized_keys
|
data/README.md
CHANGED
@@ -163,14 +163,12 @@ dev-lxc status
|
|
163
163
|
This is an example of the output.
|
164
164
|
|
165
165
|
```
|
166
|
-
Chef Server:
|
166
|
+
Chef Server: chef.lxc
|
167
|
+
Analytics: analytics.lxc
|
167
168
|
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
chef-fe1.lxc running 10.0.3.204
|
172
|
-
analytics-be.lxc running 10.0.3.206
|
173
|
-
analytics-fe1.lxc running 10.0.3.207
|
169
|
+
chef-be.lxc running 10.0.3.201
|
170
|
+
chef-fe1.lxc running 10.0.3.202
|
171
|
+
analytics.lxc running 10.0.3.204
|
174
172
|
```
|
175
173
|
|
176
174
|
#### cluster-view, tks, tls commands
|
data/lib/dev-lxc/cli.rb
CHANGED
@@ -195,27 +195,21 @@ mounts:
|
|
195
195
|
|
196
196
|
## DHCP reserved (static) IPs must be selected from the IP range 10.0.3.150 - 254
|
197
197
|
)
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
)
|
210
|
-
compliance_packages = %Q( packages:
|
211
|
-
compliance: /root/dev/chef-packages/compliance/chef-compliance_1.1.2-1_amd64.deb
|
212
|
-
)
|
213
|
-
supermarket_packages = %Q( packages:
|
214
|
-
supermarket: /root/dev/chef-packages/supermarket/supermarket_2.5.2-1_amd64.deb
|
215
|
-
)
|
198
|
+
|
199
|
+
chef_packages_path = "/root/dev/chef-packages"
|
200
|
+
open_source_package = "server: #{chef_packages_path}/osc/chef-server_11.1.6-1_amd64.deb"
|
201
|
+
chef_server_package = "server: #{chef_packages_path}/cs/chef-server-core_12.6.0-1_amd64.deb"
|
202
|
+
manage_package = "manage: #{chef_packages_path}/manage/chef-manage_2.3.0-1_amd64.deb"
|
203
|
+
reporting_package = "reporting: #{chef_packages_path}/reporting/opscode-reporting_1.5.6-1_amd64.deb"
|
204
|
+
push_jobs_server_package = "push-jobs-server: #{chef_packages_path}/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb"
|
205
|
+
analytics_package = "analytics: #{chef_packages_path}/analytics/opscode-analytics_1.4.0-1_amd64.deb"
|
206
|
+
compliance_package = "compliance: #{chef_packages_path}/compliance/chef-compliance_1.1.9-1_amd64.deb"
|
207
|
+
supermarket_package = "supermarket: #{chef_packages_path}/supermarket/supermarket_2.5.2-1_amd64.deb"
|
208
|
+
|
216
209
|
open_source_config = %Q(
|
217
210
|
chef-server:
|
218
|
-
|
211
|
+
packages:
|
212
|
+
#{open_source_package}
|
219
213
|
api_fqdn: chef.lxc
|
220
214
|
topology: open-source
|
221
215
|
servers:
|
@@ -224,7 +218,11 @@ chef-server:
|
|
224
218
|
)
|
225
219
|
tiered_chef_config = %Q(
|
226
220
|
chef-server:
|
227
|
-
|
221
|
+
packages:
|
222
|
+
#{chef_server_package}
|
223
|
+
#{manage_package}
|
224
|
+
#{reporting_package}
|
225
|
+
#{push_jobs_server_package}
|
228
226
|
topology: tier
|
229
227
|
api_fqdn: chef.lxc
|
230
228
|
servers:
|
@@ -238,28 +236,35 @@ chef-server:
|
|
238
236
|
)
|
239
237
|
chef_config = %Q(
|
240
238
|
chef-server:
|
241
|
-
|
239
|
+
packages:
|
240
|
+
#{chef_server_package}
|
241
|
+
#{manage_package}
|
242
|
+
#{reporting_package}
|
243
|
+
#{push_jobs_server_package}
|
242
244
|
servers:
|
243
245
|
chef.lxc:
|
244
246
|
ipaddress: 10.0.3.203
|
245
247
|
)
|
246
248
|
analytics_config = %Q(
|
247
249
|
analytics:
|
248
|
-
|
250
|
+
packages:
|
251
|
+
#{analytics_package}
|
249
252
|
servers:
|
250
253
|
analytics.lxc:
|
251
254
|
ipaddress: 10.0.3.204
|
252
255
|
)
|
253
256
|
compliance_config = %Q(
|
254
257
|
compliance:
|
255
|
-
|
258
|
+
packages:
|
259
|
+
#{compliance_package}
|
256
260
|
servers:
|
257
261
|
compliance.lxc:
|
258
262
|
ipaddress: 10.0.3.205
|
259
263
|
)
|
260
264
|
supermarket_config = %Q(
|
261
265
|
supermarket:
|
262
|
-
|
266
|
+
packages:
|
267
|
+
#{supermarket_package}
|
263
268
|
servers:
|
264
269
|
supermarket.lxc:
|
265
270
|
ipaddress: 10.0.3.206
|
data/lib/dev-lxc/cluster.rb
CHANGED
@@ -66,12 +66,6 @@ module DevLXC
|
|
66
66
|
end
|
67
67
|
|
68
68
|
def servers
|
69
|
-
adhoc_servers = Array.new
|
70
|
-
if @adhoc_servers
|
71
|
-
@adhoc_servers.each do |name|
|
72
|
-
adhoc_servers << Server.new(name, 'adhoc', @cluster_config)
|
73
|
-
end
|
74
|
-
end
|
75
69
|
chef_servers = Array.new
|
76
70
|
chef_servers << Server.new(@chef_server_bootstrap_backend, 'chef-server', @cluster_config) if @chef_server_bootstrap_backend
|
77
71
|
if @chef_server_topology == "tier"
|
@@ -86,9 +80,16 @@ module DevLXC
|
|
86
80
|
analytics_servers << Server.new(frontend_name, 'analytics', @cluster_config)
|
87
81
|
end
|
88
82
|
end
|
89
|
-
|
83
|
+
adhoc_servers = Array.new
|
84
|
+
if @adhoc_servers
|
85
|
+
@adhoc_servers.each do |name|
|
86
|
+
adhoc_servers << Server.new(name, 'adhoc', @cluster_config)
|
87
|
+
end
|
88
|
+
end
|
89
|
+
servers = chef_servers + analytics_servers
|
90
90
|
servers << Server.new(@compliance_fqdn, 'compliance', @cluster_config) if @compliance_fqdn
|
91
91
|
servers << Server.new(@supermarket_fqdn, 'supermarket', @cluster_config) if @supermarket_fqdn
|
92
|
+
servers += adhoc_servers
|
92
93
|
servers
|
93
94
|
end
|
94
95
|
|
data/lib/dev-lxc/server.rb
CHANGED
@@ -153,7 +153,7 @@ module DevLXC
|
|
153
153
|
when :unique
|
154
154
|
DevLXC::Container.new("u-#{@server.name}", @lxc_config_path).destroy
|
155
155
|
when :shared
|
156
|
-
DevLXC::Container.new(@shared_image_name, @lxc_config_path).destroy
|
156
|
+
DevLXC::Container.new(@shared_image_name, @lxc_config_path).destroy unless @shared_image_name.empty?
|
157
157
|
when :platform
|
158
158
|
DevLXC::Container.new(@platform_image_name, @lxc_config_path).destroy
|
159
159
|
end
|
@@ -320,6 +320,8 @@ module DevLXC
|
|
320
320
|
end
|
321
321
|
|
322
322
|
def configure_reporting
|
323
|
+
FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/var/opt/opscode-reporting")
|
324
|
+
FileUtils.touch("#{@server.config_item('lxc.rootfs')}/var/opt/opscode-reporting/.license.accepted")
|
323
325
|
if @role == 'frontend'
|
324
326
|
puts "Copying /etc/opscode-reporting from bootstrap backend '#{@chef_server_bootstrap_backend}'"
|
325
327
|
FileUtils.cp_r("#{LXC::Container.new(@chef_server_bootstrap_backend, @lxc_config_path).config_item('lxc.rootfs')}/etc/opscode-reporting",
|
@@ -335,6 +337,8 @@ module DevLXC
|
|
335
337
|
end
|
336
338
|
|
337
339
|
def configure_manage
|
340
|
+
FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/var/opt/chef-manage")
|
341
|
+
FileUtils.touch("#{@server.config_item('lxc.rootfs')}/var/opt/chef-manage/.license.accepted")
|
338
342
|
if @chef_server_type == 'private-chef'
|
339
343
|
puts "Disabling old opscode-webui in /etc/opscode/private-chef.rb"
|
340
344
|
DevLXC.search_file_delete_line("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", /opscode_webui[.enable.]/)
|
@@ -345,6 +349,8 @@ module DevLXC
|
|
345
349
|
end
|
346
350
|
|
347
351
|
def configure_analytics
|
352
|
+
FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/var/opt/opscode-analytics")
|
353
|
+
FileUtils.touch("#{@server.config_item('lxc.rootfs')}/var/opt/opscode-analytics/.license.accepted")
|
348
354
|
case @role
|
349
355
|
when "standalone", "backend"
|
350
356
|
puts "Copying /etc/opscode-analytics from Chef Server bootstrap backend '#{@chef_server_bootstrap_backend}'"
|
@@ -361,6 +367,8 @@ module DevLXC
|
|
361
367
|
end
|
362
368
|
|
363
369
|
def configure_compliance
|
370
|
+
FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/var/opt/chef-compliance")
|
371
|
+
FileUtils.touch("#{@server.config_item('lxc.rootfs')}/var/opt/chef-compliance/.license.accepted")
|
364
372
|
run_ctl("chef-compliance", "reconfigure")
|
365
373
|
end
|
366
374
|
|
data/lib/dev-lxc/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dev-lxc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.6.
|
4
|
+
version: 1.6.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jeremiah Snapp
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-04
|
11
|
+
date: 2016-05-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
108
108
|
version: '0'
|
109
109
|
requirements: []
|
110
110
|
rubyforge_project:
|
111
|
-
rubygems_version: 2.
|
111
|
+
rubygems_version: 2.6.3
|
112
112
|
signing_key:
|
113
113
|
specification_version: 4
|
114
114
|
summary: A tool for creating Chef server clusters using LXC containers
|