vagrant-conoha 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa4bd10b2a107179aa14e28588d48e7427e00d35
-  data.tar.gz: c848529d96ccee054b664a6d6cf3caaa3ecc13e5
+  metadata.gz: 9d60e497dbb3d04ba6cb029c4ffacd77ceb0d574
+  data.tar.gz: 94bbb833c14bdd25d31b3040ddfb331f388e16d4
 SHA512:
-  metadata.gz: 243f369437e47efa7b0b3f6ac4b7550b1197142156ae69fdb806e0e914bb15b63ea399ad4affbc973d4fa991c5dbd7536cd4606af572c44076d5de16bba6e925
-  data.tar.gz: cba4520b674437eb3906c10db53eac872856e4c10165ca58c0e1259d037f1075534c7b33b3b11a9b6d3020eb7386af903ab157e1a70f496da22ca8b303eb3bf3
+  metadata.gz: 68afef1ff3d64706c617d78477673c9d06ba69caa10457d1f2ae62ea5ca0a881889ed59656419da1262f8aea148b3095b4b3afafdd897f8f39a6c569cec946cc
+  data.tar.gz: 317eb48768f36c44e01397f23f9ac2b21e31b018060ac13f3267e71d5aff5ce6a04f7edca9e837bd28260a80d77bca4b7845e6e10daec09c19fb41a936b68091

data/Vagrantfile

@@ -42,6 +42,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # tyo1 sin1 sjc1のどれかです。
     conoha.region             = "tyo1"
 
+    # VPSのrootパスワードを設定します。
+    # 空文字の場合はパスワードは設定されません
+    # (コンソールログイン不可になります)
+    conoha.admin_pass         = ""
+
     # VPSのネームタグを指定します。
     conoha.metadata           = {
       instance_name_tag: "vagrant_conoha"

data/lib/vagrant-conoha/action/create_server.rb

@@ -36,6 +36,7 @@ module VagrantPlugins
             networks: @resolver.resolve_networks(env),
             volumes: @resolver.resolve_volumes(env),
             keypair_name: @resolver.resolve_keypair(env),
+            admin_pass: env[:machine].provider_config.admin_pass,
             availability_zone: env[:machine].provider_config.availability_zone,
             scheduler_hints: env[:machine].provider_config.scheduler_hints,
             security_groups: @resolver.resolve_security_groups(env),
@@ -119,6 +120,7 @@ module VagrantPlugins
             networks: options[:networks],
             scheduler_hints: options[:scheduler_hints],
             security_groups: options[:security_groups],
+            admin_pass: options[:admin_pass],
             user_data: options[:user_data],
             metadata: options[:metadata]
           }

data/lib/vagrant-conoha/client/nova.rb

@@ -66,6 +66,9 @@ module VagrantPlugins
           end
           s['flavorRef'] = options[:flavor_ref]
           s['key_name'] = options[:keypair]
+
+
+          s['adminPass'] = options[:admin_pass] unless options[:admin_pass].nil? || options[:admin_pass].empty?
           s['availability_zone'] = options[:availability_zone] unless options[:availability_zone].nil?
           s['security_groups'] = options[:security_groups] unless options[:security_groups].nil?
           s['user_data'] = Base64.encode64(options[:user_data]) unless options[:user_data].nil?

data/lib/vagrant-conoha/config.rb

@@ -67,6 +67,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :keypair_name
 
+      # The unix root password of OpenStack instance.
+      #
+      # @return [String]
+      attr_accessor :admin_pass
+
       # The SSH username to use with this OpenStack instance. This overrides
       # the `config.ssh.username` variable.
       #
@@ -213,6 +218,7 @@ module VagrantPlugins
         @rsync_includes = []
         @rsync_ignore_files = []
         @keypair_name = UNSET_VALUE
+        @admin_pass   = UNSET_VALUE
         @ssh_username = UNSET_VALUE
         @ssh_timeout = UNSET_VALUE
         @floating_ip = UNSET_VALUE
@@ -300,6 +306,7 @@ module VagrantPlugins
         @floating_ip_pool_always_allocate = false if floating_ip_pool_always_allocate == UNSET_VALUE
         @sync_method = 'rsync' if @sync_method == UNSET_VALUE
         @keypair_name = nil if @keypair_name == UNSET_VALUE
+        @admin_pass = nil if @admin_pass == UNSET_VALUE
         @public_key_path = nil if @public_key_path == UNSET_VALUE
         @availability_zone = nil if @availability_zone == UNSET_VALUE
         @scheduler_hints = nil if @scheduler_hints == UNSET_VALUE
@@ -340,6 +347,7 @@ module VagrantPlugins
         validate_ssh_username(machine, errors)
         validate_stack_config(errors)
         validate_ssh_timeout(errors)
+        validate_admin_pass(errors)
 
         if machine.config.ssh.private_key_path
           puts I18n.t('vagrant_openstack.config.keypair_name_required').yellow unless @keypair_name || @public_key_path
@@ -363,6 +371,13 @@ module VagrantPlugins
 
       private
 
+      def validate_admin_pass(errors)
+        return if @admin_pass == '' or @admin_pass == nil
+
+        reg = /\A(?=.*?[A-Z])(?=.*?[a-z])(?=.*?\d)(?=.*?[!-~&&[^A-Za-z\d]])[!-~]{9,70}+\z/
+        errors << I18n.t('vagrant_openstack.config.invalid_admin_pass') unless @admin_pass =~ reg
+      end
+
       def validate_stack_config(errors)
         @stacks.each do |stack|
           errors << I18n.t('vagrant_openstack.config.invalid_stack') unless stack[:name] && stack[:template]

data/lib/vagrant-conoha/version.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
     # Stable versions must respect the pattern given
     # by VagrantPlugins::ConoHa::VERSION_PATTERN
     #
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
 
     #
     # Stable version must respect the naming convention 'x.y.z'

data/locales/en.yml

@@ -134,6 +134,8 @@ en:
         vagrant standard configuration option `ssh.username` is required
       invalid_value_for_parameter: |-
         Invalid value '%{value}' for parameter '%{parameter}'
+      invalid_admin_pass: |-
+        admin_pass must be contain at least 9 characters, least 1 number and both lower and uppercase letters, and specialcharacters.
 
     errors:
       default: |-

data/spec/vagrant-conoha/action/create_server_spec.rb

@@ -17,6 +17,7 @@ describe VagrantPlugins::ConoHa::Action::CreateServer do
       config.stub(:scheduler_hints) { nil }
       config.stub(:security_groups) { nil }
       config.stub(:user_data) { nil }
+      config.stub(:admin_pass) { "TestPassword1234*" }
       config.stub(:metadata) { nil }
     end
   end
@@ -131,6 +132,7 @@ describe VagrantPlugins::ConoHa::Action::CreateServer do
           scheduler_hints: 'test-sched-hints',
           security_groups: ['test-sec-groups'],
           user_data: 'test-user_data',
+          admin_pass: 'TestPassword1234*',
           metadata: 'test-metadata') do
           '1234'
         end
@@ -145,6 +147,7 @@ describe VagrantPlugins::ConoHa::Action::CreateServer do
           scheduler_hints: 'test-sched-hints',
           security_groups: ['test-sec-groups'],
           user_data: 'test-user_data',
+          admin_pass: 'TestPassword1234*',
           metadata: 'test-metadata'
         }
 
@@ -166,6 +169,7 @@ describe VagrantPlugins::ConoHa::Action::CreateServer do
           scheduler_hints: nil,
           security_groups: [],
           user_data: nil,
+          admin_pass: nil,
           metadata: nil) do
           '1234'
         end
@@ -180,6 +184,7 @@ describe VagrantPlugins::ConoHa::Action::CreateServer do
           scheduler_hints: nil,
           security_groups: [],
           user_data: nil,
+          admin_pass: nil,
           metadata: nil
         }
 

data/spec/vagrant-conoha/client/nova_spec.rb

@@ -146,7 +146,7 @@ describe VagrantPlugins::ConoHa::NovaClient do
         it 'returns new instance id' do
           stub_request(:post, 'http://nova/a1b2c3/servers')
             .with(
-              body: '{"server":{"name":"inst","imageRef":"img","flavorRef":"flav","key_name":"key",'\
+              body: '{"server":{"name":"inst","imageRef":"img","flavorRef":"flav","key_name":"key","adminPass":"AdminPass123%",'\
               '"security_groups":[{"name":"default"}],"user_data":"dXNlcl9kYXRhX3Rlc3Q=\n","metadata":"metadata_test"},'\
               '"os:scheduler_hints":"sched_hints_test"}',
               headers:
@@ -162,6 +162,7 @@ describe VagrantPlugins::ConoHa::NovaClient do
             name: 'inst',
             image_ref: 'img',
             flavor_ref: 'flav',
+            admin_pass: 'AdminPass123%',
             networks: nil,
             keypair: 'key',
             security_groups: [{ name: 'default' }],

data/vagrant-conoha.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |gem|
   gem.version       = VagrantPlugins::ConoHa::VERSION
   gem.authors       = ['Hironobu Saitoh']
   gem.email         = ['hiro@hironobu.org']
-  gem.description   = 'Enables Vagrant to manage VPS in ConoHa. (forked from github.com/ggiamarchi/vagrant-openstack-provider)'
-  gem.summary       = 'Enables Vagrant to manage VPS in ConoHa. (forked from github.com/ggiamarchi/vagrant-openstack-provider)'
+  gem.description   = 'Enables Vagrant to manage VPS in ConoHa.'
+  gem.summary       = 'Enables Vagrant to manage VPS in ConoHa.'
   gem.homepage      = 'https://github.com/hironobu-s/vagrant-conoha/'
   gem.license       = 'MIT'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-conoha
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Hironobu Saitoh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-22 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -164,7 +164,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.2
-description: Enables Vagrant to manage VPS in ConoHa. (forked from github.com/ggiamarchi/vagrant-openstack-provider)
+description: Enables Vagrant to manage VPS in ConoHa.
 email:
 - hiro@hironobu.org
 executables: []
@@ -301,7 +301,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Enables Vagrant to manage VPS in ConoHa. (forked from github.com/ggiamarchi/vagrant-openstack-provider)
+summary: Enables Vagrant to manage VPS in ConoHa.
 test_files:
 - spec/vagrant-conoha/action/connect_openstack_spec.rb
 - spec/vagrant-conoha/action/create_server_spec.rb