pec 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cefd07be61ec9656d0e02261e62d070cbb4961c6
-  data.tar.gz: f3e93da995b904fe2a81d8e028b4f4204d9e494d
+  metadata.gz: 8c854b8e393a921d53b14b6faa4704c69179e89f
+  data.tar.gz: b5e10b9145475986f2f59b23fb762bcac456bd1b
 SHA512:
-  metadata.gz: 366e3f45dea1360986f86c9cec87919d1c2c4daebf7c6eb749f4652cde1e119bd0c9e27a87763e4354118cd4079ca033afe70eec5d3ead5f2410a3fe4c403520
-  data.tar.gz: 95ea3f84939fac4bfd34a68dee1ebd69d19646106dec8372121f6154434028c0b8eea8847347799ab616bb548d93e7b4a16e7917210d1767d64598f2da5c1474
+  metadata.gz: fc62df875382a1a9e46f84592212f69ec4c015132aa2804f8b698084b3af401218c6c005df8cf41dc7442bde7cd85910f3c1221dcc394c06f4c2063839fdc009
+  data.tar.gz: aa06178e8af7c13cb6019ee4db98624f873be9ab1e2368730522ce5942e548348d788162f71d2a1a34be1af2270f2c9b3c2f822d9576df782e01011aeeff040c

data/README.md

@@ -18,7 +18,7 @@ OpenStackにおいて複数サーバの起動一括起動停止や、 DHCPサー
 
 ```
 create - /Pec.yaml
-create - /user_datas/web_server.yaml.sample
+create - /user_data/web_server.yaml.sample
 ```
 
 Pec.yamlに基づきホストを作成します。
@@ -33,10 +33,13 @@ Pec.yamlに基づきホストを作成します。
 ### Configure
 #### Pec.yaml
 ```
-pyama-test001:
+_default_: &def
   tenant: your_tenant
   image: centos-7.1_chef-12.3_puppet-3.7
   flavor: m1.small
+
+pyama-test001:
+  <<: *def
   networks:
     eth0:
       bootproto: static
@@ -57,8 +60,7 @@ pyama-test001:
     fqdn: pyama-test001.ikemen.com
     repo_releasever: 7.1.1503
 pyama-test002:
-  image: centos-7.1_chef-12.3_puppet-3.7
-  flavor: m1.midium
+  <<: *def
 ・・・
 
 ```
@@ -66,14 +68,15 @@ pyama-test002:
 
 | 項目名         | 説明                                           | 必須 | 例示                            |
 | -------------- | ---------------------------------------------- | ---- | ------------------------------- |
-| instance_name  | インスタンス名                                 | ○    | pyama-test001                   |
+| instance_name  | インスタンス名                                 | ○    | pyama-test001*                   |
 | tenant         | テナント名                                     | ○    | your_tenant                     |
 | image          | イメージ名                                     | ○    | centos-7.1_chef-12.3_puppet-3.7 |
 | flavor         | フレーバー名                                   | ○    | m1.small                        |
 | networks       | ネットワーク定義                               | -    | []                              |
 | security_group | セキュリティグループ名                         | -    | [default,ssh]                   |
-| templates      | `user_data`のテンプレート.`./user_datas`に配置 | -    | [base.yaml,webserver.yaml]      |
+| templates      | `user_data`のテンプレート.`./user_data`に配置 | -    | [base.yaml,webserver.yaml]      |
 | user_data      | cloud-init記法に準拠                           | -    | -                               |
+* 先頭が_で開始されるインスタンス名はyaml merge記法用途と認識し、スキップします
 
 ##### Networks
 | 項目名       | 説明             | 必須 | 例示           |

data/lib/pec/configure.rb

@@ -11,17 +11,11 @@ module Pec
       else
         hash = YAML.load_file(file_name).to_hash
       end
-
-      config_default = {}
-      hash.each do |config|
-        if config[0] =~ /^_DEFAULT_/
-          config_default = config_default.update(config[1])
-          next
-        end
-        config[1] = config_default.update(config[1])
+     
+      hash.reject {|c| c[0].to_s.match(/^_/)}.each do |config|
 
         config[1]['user_data'] ||= {}
-        config[1]['user_data']['fqdn'] ||= config[0]
+        config[1]['user_data']['fqdn'] ||= config[0].to_s
 
         host = Pec::Configure::Host.new(config)
         @configure << host if host

data/lib/pec/configure/host.rb

@@ -1,7 +1,7 @@
 module Pec
   class Configure
     class Host
-      attr_reader :name, :image, :flavor,:security_group, :user_data, :networks, :templates, :tenant
+      attr_reader :name, :image, :flavor,:security_group, :user_data, :networks, :templates, :tenant, :availability_zone
       def initialize(config)
         check_format(config)
         append_network(config[1])
@@ -12,6 +12,7 @@ module Pec
         @user_data      = config[1]["user_data"];
         @templates      = config[1]["templates"]
         @tenant         = config[1]["tenant"]
+        @availability_zone = config[1]["availability_zone"]
       end
 
       def append_network(config)

data/lib/pec/configure/user_data.rb

@@ -14,8 +14,8 @@ module Pec
         def get_template(config)
           config.templates.inject({}) do |merge_template, template|
             template.to_s.concat('.yaml') unless template.to_s.match(/.*\.yaml/)
-            raise(Pec::Errors::UserData, "template:#{template} is not fond!") unless FileTest.exist?("user_datas/#{template}")
-            merge_template.deep_merge!(YAML.load_file("user_datas/#{template}").to_hash)
+            raise(Pec::Errors::UserData, "template:#{template} is not fond!") unless FileTest.exist?("user_data/#{template}")
+            merge_template.deep_merge!(YAML.load_file("user_data/#{template}").to_hash)
           end if config.templates
         end
 
@@ -34,4 +34,3 @@ module Pec
     end
   end
 end
-

data/lib/pec/director/helper.rb

@@ -26,6 +26,10 @@ module Pec
           ports ? options.merge({ 'nics' =>  ports.map { |port| { port_id: port.id } } }) : options
         end
 
+        def set_availability_zone(options, host)
+          host.availability_zone ? options.merge({ 'availability_zone' => host.availability_zone }) : options
+        end
+
         def get_security_group_id(security_groups)
           security_groups.map do |sg_name|
             sg = Pec::Network::Security_Group.fetch(sg_name)

data/lib/pec/director/make_director.rb

@@ -21,6 +21,7 @@ module Pec
         image_ref  = Pec::Compute::Image.get_ref(host.image)
         options    = { "user_data" => Pec::Configure::UserData.make(host, ports) }
         options    = Pec::Director::Helper.set_nics(options, ports)
+        options    = Pec::Director::Helper.set_availability_zone(options, host)
 
         Pec::Compute::Server.create(host.name, image_ref, flavor_ref, options)
       end

data/lib/pec/director/vm_status_director.rb

@@ -11,22 +11,25 @@ module Pec
       end
 
       def show_summary(host)
-        server       = Pec::Compute::Server.fetch(host.name)
-        status       = "uncreated"
-        compute_node = ""
-        tenant_name  = ""
-        flavor       = ""
-        ip_address   = ""
+        server            = Pec::Compute::Server.fetch(host.name)
+        status            = "uncreated"
+        availability_zone = ""
+        compute_node      = ""
+        tenant_name       = ""
+        flavor            = ""
+        ip_address        = ""
         if server
           detail = Pec::Resource.get.get_server_details(server["id"])
           status = detail["status"] 
+          availability_zone = detail["OS-EXT-AZ:availability_zone"]
           compute_node = detail["OS-EXT-SRV-ATTR:host"]
           tenant_name = Pec::Compute::Tenant.get_name(detail["tenant_id"])
           flavor = Pec::Compute::Flavor.get_name(detail["flavor"]["id"])
           ip_address = Pec::Director::Helper.parse_from_addresses(detail["addresses"]).join(",")
         end
 
-        puts sprintf(" %-35s %-10s %-10s %-10s %-35s %-48s", host.name, status, tenant_name, flavor, compute_node, ip_address)
+        puts sprintf(" %-35s %-10s %-10s %-10s %-10s %-35s %-48s",
+                     host.name, status, tenant_name, flavor, availability_zone, compute_node, ip_address)
       end
 
       def err_message(e, host)

data/lib/pec/init.rb

@@ -2,13 +2,13 @@ module Pec
   class Init
     class << self
       def create_template_dir
-        dirname = "user_datas"
+        dirname = "user_data"
         unless FileTest.exist?(dirname)
-          FileUtils.mkdir_p(dirname) 
+          FileUtils.mkdir_p(dirname)
           open("#{dirname}/web_server.yaml.sample","w") do |e|
             YAML.dump(Pec::Configure::Sample.user_data, e)
           end if FileTest.exist?(dirname)
-          puts "create directry user_datas".green
+          puts "create directry user_data".green
         end
       end
 
@@ -23,7 +23,7 @@ module Pec
 
       def create_fog_config
         thor = Thor.new
-        if !File.exist?(File.expand_path("~/.fog")) || thor.yes?("Do you want to overwrite the existing ~/.fog? [y/N]") 
+        if !File.exist?(File.expand_path("~/.fog")) || thor.yes?("Do you want to overwrite the existing ~/.fog? [y/N]")
           thor.say("Start Configure by OpenStack", :yellow)
           params = {}
 

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: openstack vm booter.