imagemaster3000 0.6.0 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +5 -0
  3. data/README.md +14 -4
  4. data/config/imagemaster3000.yml +6 -1
  5. data/lib/imagemaster3000/cli.rb +23 -2
  6. data/lib/imagemaster3000/image_list/templates/image_list.erb +4 -5
  7. data/lib/imagemaster3000/main_process.rb +1 -1
  8. data/lib/imagemaster3000/version.rb +1 -1
  9. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6f6915095a20c1e095d889f8f2223bfbfe5413dc
4
- data.tar.gz: 83e53f574c23f6ae55d127d04e93e02d37a685c1
3
+ metadata.gz: 12db545fdb2c945fe2078f75e7696a5780fd0bb6
4
+ data.tar.gz: 24ee73c3e748685d9c2636513ef3aff92ee29fb1
5
5
  SHA512:
6
- metadata.gz: aa73318b9a5b260232e58e5f01ec87d5ace579652cdcb3a642a5fabf0590a57a461b51dc47ec96a697a777684f07b932e0fa1137286aabc01fe63b3466de7ed3
7
- data.tar.gz: b4365e0e6797959420bddebe5638e86571bd7dcf89058a6b0c4c1d94cdd5c690b40abb8ce774685452304157769c262b58b7888ced28813c63a4c6398e6c0edc
6
+ metadata.gz: d3195e4a60c431c3fdb77c29831f5e6037869e2048eabd4434bb95f834c1b81d4f8ab1e734ea6e870bbb48c75f3def12a968517fca860193cd017bd91912fb77
7
+ data.tar.gz: def7039b704391b18c49a0b1add5517b4f08ed1ebaa058051b3d1f44ef8678f745737502150491ab25f8b93f24c01b35f87adeae209fe4a197a267d8dec881c2
data/.rubocop.yml CHANGED
@@ -5,6 +5,11 @@ AllCops:
5
5
  Exclude:
6
6
  - 'vendor/**/*'
7
7
 
8
+ Metrics/ClassLength:
9
+ Max: 120
10
+ Exclude:
11
+ - 'lib/imagemaster3000/cli.rb'
12
+
8
13
  Metrics/LineLength:
9
14
  Max: 135
10
15
 
data/README.md CHANGED
@@ -23,17 +23,27 @@ bundle exec rake spec
23
23
  ## Usage
24
24
  ```
25
25
  Usage:
26
- imagemaster3000 start --binaries-guestfish=BINARIES-GUESTFISH --binaries-virt-copy-in=BINARIES-VIRT-COPY-IN --certificate=CERTIFICATE --definitions-repository=DEFINITIONS-REPOSITORY --endpoint=ENDPOINT --group=GROUP --image-dir=IMAGE-DIR --image-list=IMAGE-LIST --key=KEY
26
+ imagemaster3000 start --binaries-guestfish=BINARIES-GUESTFISH --binaries-virt-copy-in=BINARIES-VIRT-COPY-IN --certificate=CERTIFICATE --definitions-repository=DEFINITIONS-REPOSITORY --endpoint=ENDPOINT --group=GROUP
27
+ --image-dir=IMAGE-DIR --image-list-description=IMAGE-LIST-DESCRIPTION --image-list-identifier=IMAGE-LIST-IDENTIFIER --image-list-mpuri=IMAGE-LIST-MPURI --image-list-path=IMAGE-LIST-PATH --image-list-source=IMAGE-LIST-S
28
+ OURCE --key=KEY
27
29
 
28
30
  Options:
29
31
  --definitions-repository=DEFINITIONS-REPOSITORY # Repository from which image definitions will be downloaded
30
32
  [--definitions-branch=DEFINITIONS-BRANCH] # Repository branch that will be used
31
33
  --image-dir=IMAGE-DIR # Directory where to temporarily store images
32
- # Default: /var/spool/imagemaster3000/images/
34
+ # Default: /var/spool/imagemaster3000/
33
35
  --group=GROUP # Group, images will be uploaded to
34
36
  # Default: imagemaster3000
35
- --image-list=IMAGE-LIST # Name and path of generated image list
36
- # Default: /var/spool/imagemaster3000/image-list/imagemaster3000.list
37
+ --image-list-path=IMAGE-LIST-PATH # Name and path of generated image list
38
+ # Default: /var/spool/imagemaster3000/imagemaster3000.list
39
+ --image-list-description=IMAGE-LIST-DESCRIPTION # Imagelist description required by cloudkeeper
40
+ # Default: Imagemaster3000 image list
41
+ --image-list-identifier=IMAGE-LIST-IDENTIFIER # Imagelist identifier required by cloudkeeper
42
+ # Default: Imagemaster3000 cloud images
43
+ --image-list-source=IMAGE-LIST-SOURCE # Imagelist source required by cloudkeeper
44
+ # Default: https://cloud.metacentrum.cz/
45
+ --image-list-mpuri=IMAGE-LIST-MPURI # Imagelist mpuri required by cloudkeeper
46
+ # Default: mpuri-placeholder
37
47
  --endpoint=ENDPOINT # Endpoint where image list will be available
38
48
  # Default: http://localhost/
39
49
  --certificate=CERTIFICATE # Certificate to sign image list with
data/config/imagemaster3000.yml CHANGED
@@ -3,7 +3,12 @@ imagemaster3000:
3
3
  repository: # Repository from which image definitions will be downloaded
4
4
  branch: # Repository branch that will be used
5
5
  image-dir: /var/spool/imagemaster3000/ # Directory where to temporarily store images
6
- image-list: /var/spool/imagemaster3000/imagemaster3000.list # Name and path of generated image list
6
+ image-list:
7
+ path: /var/spool/imagemaster3000/imagemaster3000.list # Name and path of generated image list
8
+ description: Imagemaster3000 image list # Imagelist description required by cloudkeeper
9
+ identifier: Imagemaster3000 cloud images # Imagelist identifier required by cloudkeeper
10
+ source: https://cloud.metacentrum.cz/ # Imagelist source required by cloudkeeper
11
+ mpuri: mpuri-placeholder # Imagelist mpuri required by cloudkeeper
7
12
  endpoint: http://localhost/ # Endpoint where image list will be available
8
13
  certificate: /etc/grid-security/cert.pem # Certificate to sign image list with
9
14
  key: /etc/grid-security/key.pem # Key to sign image list with
data/lib/imagemaster3000/cli.rb CHANGED
@@ -36,11 +36,32 @@ module Imagemaster3000
36
36
  default: Imagemaster3000::Settings['group'],
37
37
  type: :string,
38
38
  desc: 'Group, images will be uploaded to'
39
- method_option :'image-list',
39
+ method_option :'image-list-path',
40
40
  required: true,
41
- default: Imagemaster3000::Settings['image-list'],
41
+ default: Imagemaster3000::Settings['image-list']['path'],
42
42
  type: :string,
43
43
  desc: 'Name and path of generated image list'
44
+ method_option :'image-list-description',
45
+ required: true,
46
+ default: Imagemaster3000::Settings['image-list']['description'],
47
+ type: :string,
48
+ desc: 'Imagelist description required by cloudkeeper'
49
+ method_option :'image-list-identifier',
50
+ required: true,
51
+ default: Imagemaster3000::Settings['image-list']['identifier'],
52
+ type: :string,
53
+ desc: 'Imagelist identifier required by cloudkeeper'
54
+ method_option :'image-list-source',
55
+ required: true,
56
+ default: Imagemaster3000::Settings['image-list']['source'],
57
+ type: :string,
58
+ desc: 'Imagelist source required by cloudkeeper'
59
+ method_option :'image-list-mpuri',
60
+ required: true,
61
+ default: Imagemaster3000::Settings['image-list']['mpuri'],
62
+ type: :string,
63
+ desc: 'Imagelist mpuri required by cloudkeeper'
64
+
44
65
  method_option :endpoint,
45
66
  required: true,
46
67
  default: Imagemaster3000::Settings['endpoint'],
data/lib/imagemaster3000/image_list/templates/image_list.erb CHANGED
@@ -2,10 +2,9 @@
2
2
  "hv:imagelist":{
3
3
  "dc:date:created":"<%= Time.now.strftime('%Y-%m-%dT%H:%M:%SZ') %>",
4
4
  "dc:date:expires":"<%= (Time.now + 6.months).strftime('%Y-%m-%dT%H:%M:%SZ') %>",
5
- "dc:description":"CESNET MetaCloud image list",
6
- "dc:identifier":"imagemaster3000-metacloud",
7
- "dc:source":"https://cloud.metacentrum.cz/",
8
- "dc:title":"CESNET MetaCloud",
5
+ "dc:description":"<%= Imagemaster3000::Settings[:'image-list-description'] %>",
6
+ "dc:identifier":"<%= Imagemaster3000::Settings[:'image-list-identifier'] %>",
7
+ "dc:source":"<%= Imagemaster3000::Settings[:'image-list-source'] %>",
9
8
  "ad:vo": "<%= Imagemaster3000::Settings[:group] %>",
10
9
  "hv:images":[
11
10
  <% images.each_with_index do |image, index| -%>
@@ -13,7 +12,7 @@
13
12
  "hv:image":{
14
13
  "dc:description":"<%= image.name %>",
15
14
  "dc:identifier":"<%= image.name %>",
16
- "ad:mpuri":"imagemaster3000-metacloud",
15
+ "ad:mpuri":"<%= Imagemaster3000::Settings[:'image-list-mpuri'] %>",
17
16
  "dc:title":"<%= image.name %>",
18
17
  "hv:hypervisor":"QEMU-KVM",
19
18
  <% if image.ram -%>
data/lib/imagemaster3000/main_process.rb CHANGED
@@ -35,7 +35,7 @@ module Imagemaster3000
35
35
  def generate_image_list
36
36
  logger.debug 'Generating image list'
37
37
  image_list = Imagemaster3000::ImageList::Signer.sign(Imagemaster3000::ImageList::Generator.generate(images))
38
- File.write Imagemaster3000::Settings[:'image-list'], image_list
38
+ File.write Imagemaster3000::Settings[:'image-list-path'], image_list
39
39
  end
40
40
  end
41
41
  end
data/lib/imagemaster3000/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Imagemaster3000
2
- VERSION = '0.6.0'.freeze
2
+ VERSION = '0.7.0'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: imagemaster3000
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michal Kimle
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-07-31 00:00:00.000000000 Z
11
+ date: 2017-09-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -349,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
349
349
  version: '0'
350
350
  requirements: []
351
351
  rubyforge_project:
352
- rubygems_version: 2.6.10
352
+ rubygems_version: 2.6.13
353
353
  signing_key:
354
354
  specification_version: 4
355
355
  summary: Downloading and slight modification of cloud images