diff --git a/.travis.yml b/.travis.yml index 85b6d75..4c1076c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ rvm: - 2.3.4 - 2.4.1 - ruby-head - - jruby + - jruby-9.1.13.0 - jruby-head jdk: diff --git a/lib/occi/core/version.rb b/lib/occi/core/version.rb index cb743f1..2450fba 100644 --- a/lib/occi/core/version.rb +++ b/lib/occi/core/version.rb @@ -2,7 +2,7 @@ module Occi module Core MAJOR_VERSION = 5 # Major update constant MINOR_VERSION = 0 # Minor update constant - PATCH_VERSION = 2 # Patch/Fix version constant + PATCH_VERSION = 3 # Patch/Fix version constant STAGE_VERSION = nil # use `nil` for production releases unless defined?(::Occi::Core::VERSION) diff --git a/lib/occi/infrastructure/warehouse/mixins/attributes/occi.compute.userdata.yml b/lib/occi/infrastructure/warehouse/mixins/attributes/occi.compute.userdata.yml index 7578ce9..76bf68a 100644 --- a/lib/occi/infrastructure/warehouse/mixins/attributes/occi.compute.userdata.yml +++ b/lib/occi/infrastructure/warehouse/mixins/attributes/occi.compute.userdata.yml @@ -1,7 +1,7 @@ --- type: !ruby/class String required: false -mutable: true +mutable: false default: ~ description: Contextualization data formatted as Base64-encoded string (ref. 'cloud-config') pattern: !ruby/regexp '/^.+$/' diff --git a/lib/occi/infrastructure/warehouse/mixins/attributes/occi.credentials.ssh.publickey.yml b/lib/occi/infrastructure/warehouse/mixins/attributes/occi.credentials.ssh.publickey.yml index 27d821d..d715751 100644 --- a/lib/occi/infrastructure/warehouse/mixins/attributes/occi.credentials.ssh.publickey.yml +++ b/lib/occi/infrastructure/warehouse/mixins/attributes/occi.credentials.ssh.publickey.yml @@ -1,7 +1,7 @@ --- type: !ruby/class String required: false -mutable: true +mutable: false default: ~ description: Public SSH key formatted as Base64-encoded string (ref. 'authorized_keys') pattern: !ruby/regexp '/^.+$/' diff --git a/lib/occi/infrastructure/warehouse/mixins/attributes/org.openstack.compute.user_data.yml b/lib/occi/infrastructure/warehouse/mixins/attributes/org.openstack.compute.user_data.yml new file mode 100644 index 0000000..76bf68a --- /dev/null +++ b/lib/occi/infrastructure/warehouse/mixins/attributes/org.openstack.compute.user_data.yml @@ -0,0 +1,7 @@ +--- +type: !ruby/class String +required: false +mutable: false +default: ~ +description: Contextualization data formatted as Base64-encoded string (ref. 'cloud-config') +pattern: !ruby/regexp '/^.+$/' diff --git a/lib/occi/infrastructure/warehouse/mixins/attributes/org.openstack.credentials.publickey.data.yml b/lib/occi/infrastructure/warehouse/mixins/attributes/org.openstack.credentials.publickey.data.yml new file mode 100644 index 0000000..d715751 --- /dev/null +++ b/lib/occi/infrastructure/warehouse/mixins/attributes/org.openstack.credentials.publickey.data.yml @@ -0,0 +1,7 @@ +--- +type: !ruby/class String +required: false +mutable: false +default: ~ +description: Public SSH key formatted as Base64-encoded string (ref. 'authorized_keys') +pattern: !ruby/regexp '/^.+$/' diff --git a/lib/occi/infrastructure/warehouse/mixins/attributes/org.openstack.credentials.publickey.name.yml b/lib/occi/infrastructure/warehouse/mixins/attributes/org.openstack.credentials.publickey.name.yml new file mode 100644 index 0000000..f7be1a3 --- /dev/null +++ b/lib/occi/infrastructure/warehouse/mixins/attributes/org.openstack.credentials.publickey.name.yml @@ -0,0 +1,7 @@ +--- +type: !ruby/class String +required: false +mutable: false +default: ~ +description: Name used for the provided SSH key. +pattern: !ruby/regexp '/^.+$/' diff --git a/lib/occi/infrastructure/warehouse/mixins/old_user_data.yml b/lib/occi/infrastructure/warehouse/mixins/old_user_data.yml new file mode 100644 index 0000000..ef8091e --- /dev/null +++ b/lib/occi/infrastructure/warehouse/mixins/old_user_data.yml @@ -0,0 +1,9 @@ +--- +term: user_data +schema: http://schemas.openstack.org/compute/instance# +title: OCCI contextualization data to be injected into a compute instance +attributes: + - org.openstack.compute.user_data +location: /mixin/old_user_data +applies: + - http://schemas.ogf.org/occi/infrastructure#compute diff --git a/lib/occi/infrastructure/warehouse/mixins/public_key.yml b/lib/occi/infrastructure/warehouse/mixins/public_key.yml new file mode 100644 index 0000000..423edf2 --- /dev/null +++ b/lib/occi/infrastructure/warehouse/mixins/public_key.yml @@ -0,0 +1,10 @@ +--- +term: public_key +schema: http://schemas.openstack.org/instance/credentials# +title: OCCI SSH public key to be injected into a compute instance +attributes: + - org.openstack.credentials.publickey.name + - org.openstack.credentials.publickey.data +location: /mixin/public_key +applies: + - http://schemas.ogf.org/occi/infrastructure#compute diff --git a/occi-core.gemspec b/occi-core.gemspec index 828331b..47957d1 100644 --- a/occi-core.gemspec +++ b/occi-core.gemspec @@ -17,20 +17,20 @@ Gem::Specification.new do |gem| gem.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } gem.require_paths = ['lib'] - gem.add_runtime_dependency 'json', '>= 1.8', '< 3' gem.add_runtime_dependency 'activesupport', '>= 4.0', '< 6' + gem.add_runtime_dependency 'json', '>= 1.8', '< 3' gem.add_runtime_dependency 'json-schema', '>= 2.5', '< 3' gem.add_runtime_dependency 'yell', '>= 2.0', '< 3' gem.add_development_dependency 'bundler', '>= 1.12', '< 2' + gem.add_development_dependency 'fasterer', '>= 0.3.2', '< 0.4' + gem.add_development_dependency 'pry', '>= 0.10', '< 1' gem.add_development_dependency 'rake', '>= 11.0', '< 13' gem.add_development_dependency 'rspec', '>= 3.4', '< 4' - gem.add_development_dependency 'simplecov', '>= 0.11', '< 1' - gem.add_development_dependency 'pry', '>= 0.10', '< 1' gem.add_development_dependency 'rubocop', '>= 0.32', '< 1' gem.add_development_dependency 'rubygems-tasks', '>= 0.2', '< 1' + gem.add_development_dependency 'simplecov', '>= 0.11', '< 1' gem.add_development_dependency 'yard', '>= 0.8', '< 1' - gem.add_development_dependency 'fasterer', '>= 0.3.2', '< 0.4' gem.required_ruby_version = '>= 2.2.2' end