imagemaster3000 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f6915095a20c1e095d889f8f2223bfbfe5413dc
-  data.tar.gz: 83e53f574c23f6ae55d127d04e93e02d37a685c1
+  metadata.gz: 12db545fdb2c945fe2078f75e7696a5780fd0bb6
+  data.tar.gz: 24ee73c3e748685d9c2636513ef3aff92ee29fb1
 SHA512:
-  metadata.gz: aa73318b9a5b260232e58e5f01ec87d5ace579652cdcb3a642a5fabf0590a57a461b51dc47ec96a697a777684f07b932e0fa1137286aabc01fe63b3466de7ed3
-  data.tar.gz: b4365e0e6797959420bddebe5638e86571bd7dcf89058a6b0c4c1d94cdd5c690b40abb8ce774685452304157769c262b58b7888ced28813c63a4c6398e6c0edc
+  metadata.gz: d3195e4a60c431c3fdb77c29831f5e6037869e2048eabd4434bb95f834c1b81d4f8ab1e734ea6e870bbb48c75f3def12a968517fca860193cd017bd91912fb77
+  data.tar.gz: def7039b704391b18c49a0b1add5517b4f08ed1ebaa058051b3d1f44ef8678f745737502150491ab25f8b93f24c01b35f87adeae209fe4a197a267d8dec881c2

data/.rubocop.yml

@@ -5,6 +5,11 @@ AllCops:
   Exclude:
     - 'vendor/**/*'
 
+Metrics/ClassLength:
+  Max: 120
+  Exclude:
+    - 'lib/imagemaster3000/cli.rb'
+
 Metrics/LineLength:
   Max: 135
 

data/README.md

@@ -23,17 +23,27 @@ bundle exec rake spec
 ## Usage
 ```
 Usage:
-  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
+  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-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
+OURCE --key=KEY
 
 Options:
   --definitions-repository=DEFINITIONS-REPOSITORY  # Repository from which image definitions will be downloaded
   [--definitions-branch=DEFINITIONS-BRANCH]        # Repository branch that will be used
   --image-dir=IMAGE-DIR                            # Directory where to temporarily store images
-                                                   # Default: /var/spool/imagemaster3000/images/
+                                                   # Default: /var/spool/imagemaster3000/
   --group=GROUP                                    # Group, images will be uploaded to
                                                    # Default: imagemaster3000
-  --image-list=IMAGE-LIST                          # Name and path of generated image list
-                                                   # Default: /var/spool/imagemaster3000/image-list/imagemaster3000.list
+  --image-list-path=IMAGE-LIST-PATH                # Name and path of generated image list
+                                                   # Default: /var/spool/imagemaster3000/imagemaster3000.list
+  --image-list-description=IMAGE-LIST-DESCRIPTION  # Imagelist description required by cloudkeeper
+                                                   # Default: Imagemaster3000 image list
+  --image-list-identifier=IMAGE-LIST-IDENTIFIER    # Imagelist identifier required by cloudkeeper
+                                                   # Default: Imagemaster3000 cloud images
+  --image-list-source=IMAGE-LIST-SOURCE            # Imagelist source required by cloudkeeper
+                                                   # Default: https://cloud.metacentrum.cz/
+  --image-list-mpuri=IMAGE-LIST-MPURI              # Imagelist mpuri required by cloudkeeper
+                                                   # Default: mpuri-placeholder
   --endpoint=ENDPOINT                              # Endpoint where image list will be available
                                                    # Default: http://localhost/
   --certificate=CERTIFICATE                        # Certificate to sign image list with

data/config/imagemaster3000.yml

@@ -3,7 +3,12 @@ imagemaster3000:
     repository: # Repository from which image definitions will be downloaded
     branch: # Repository branch that will be used
   image-dir: /var/spool/imagemaster3000/ # Directory where to temporarily store images
-  image-list: /var/spool/imagemaster3000/imagemaster3000.list # Name and path of generated image list
+  image-list:
+    path: /var/spool/imagemaster3000/imagemaster3000.list # Name and path of generated image list
+    description: Imagemaster3000 image list # Imagelist description required by cloudkeeper
+    identifier: Imagemaster3000 cloud images # Imagelist identifier required by cloudkeeper
+    source: https://cloud.metacentrum.cz/ # Imagelist source required by cloudkeeper
+    mpuri: mpuri-placeholder # Imagelist mpuri required by cloudkeeper
   endpoint: http://localhost/ # Endpoint where image list will be available
   certificate: /etc/grid-security/cert.pem # Certificate to sign image list with
   key: /etc/grid-security/key.pem # Key to sign image list with

data/lib/imagemaster3000/cli.rb

@@ -36,11 +36,32 @@ module Imagemaster3000
                   default: Imagemaster3000::Settings['group'],
                   type: :string,
                   desc: 'Group, images will be uploaded to'
-    method_option :'image-list',
+    method_option :'image-list-path',
                   required: true,
-                  default: Imagemaster3000::Settings['image-list'],
+                  default: Imagemaster3000::Settings['image-list']['path'],
                   type: :string,
                   desc: 'Name and path of generated image list'
+    method_option :'image-list-description',
+                  required: true,
+                  default: Imagemaster3000::Settings['image-list']['description'],
+                  type: :string,
+                  desc: 'Imagelist description required by cloudkeeper'
+    method_option :'image-list-identifier',
+                  required: true,
+                  default: Imagemaster3000::Settings['image-list']['identifier'],
+                  type: :string,
+                  desc: 'Imagelist identifier required by cloudkeeper'
+    method_option :'image-list-source',
+                  required: true,
+                  default: Imagemaster3000::Settings['image-list']['source'],
+                  type: :string,
+                  desc: 'Imagelist source required by cloudkeeper'
+    method_option :'image-list-mpuri',
+                  required: true,
+                  default: Imagemaster3000::Settings['image-list']['mpuri'],
+                  type: :string,
+                  desc: 'Imagelist mpuri required by cloudkeeper'
+
     method_option :endpoint,
                   required: true,
                   default: Imagemaster3000::Settings['endpoint'],

data/lib/imagemaster3000/image_list/templates/image_list.erb

@@ -2,10 +2,9 @@
   "hv:imagelist":{
     "dc:date:created":"<%= Time.now.strftime('%Y-%m-%dT%H:%M:%SZ') %>",
     "dc:date:expires":"<%= (Time.now + 6.months).strftime('%Y-%m-%dT%H:%M:%SZ') %>",
-    "dc:description":"CESNET MetaCloud image list",
-    "dc:identifier":"imagemaster3000-metacloud",
-    "dc:source":"https://cloud.metacentrum.cz/",
-    "dc:title":"CESNET MetaCloud",
+    "dc:description":"<%= Imagemaster3000::Settings[:'image-list-description'] %>",
+    "dc:identifier":"<%= Imagemaster3000::Settings[:'image-list-identifier'] %>",
+    "dc:source":"<%= Imagemaster3000::Settings[:'image-list-source'] %>",
     "ad:vo": "<%= Imagemaster3000::Settings[:group] %>",
     "hv:images":[
 <% images.each_with_index do |image, index| -%>
@@ -13,7 +12,7 @@
         "hv:image":{
           "dc:description":"<%= image.name %>",
           "dc:identifier":"<%= image.name %>",
-          "ad:mpuri":"imagemaster3000-metacloud",
+          "ad:mpuri":"<%= Imagemaster3000::Settings[:'image-list-mpuri'] %>",
           "dc:title":"<%= image.name %>",
           "hv:hypervisor":"QEMU-KVM",
 <% if image.ram -%>

data/lib/imagemaster3000/main_process.rb

@@ -35,7 +35,7 @@ module Imagemaster3000
     def generate_image_list
       logger.debug 'Generating image list'
       image_list = Imagemaster3000::ImageList::Signer.sign(Imagemaster3000::ImageList::Generator.generate(images))
-      File.write Imagemaster3000::Settings[:'image-list'], image_list
+      File.write Imagemaster3000::Settings[:'image-list-path'], image_list
     end
   end
 end

data/lib/imagemaster3000/version.rb

@@ -1,3 +1,3 @@
 module Imagemaster3000
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagemaster3000
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -349,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Downloading and slight modification of cloud images