openstack
/
fuel-astute
Code Issues Proposed changes

* use ActiveSupport for additional Hash methods; 

* remove double 'json' require;
* add new data to validation schemas;
* return info about errors in validations to stderr;
This commit is contained in:
Vladmir Sharhsov(warpc) 2013-08-26 13:11:31 +04:00
parent 64ca50fa23
commit 0fa7d328e6
6 changed files with 41 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/astute
View File

@ -32,7 +32,7 @@ class ConsoleReporter
end
def report_and_exit(exception, verbose)
puts "Error: #{exception.inspect}"
$stderr.puts "Error: #{exception.inspect}"
unless verbose
puts "Hint: use astute with --verbose or check log (#{Astute::LOG_PATH}) for more details"
end

1
lib/astute.rb
View File

@ -17,6 +17,7 @@ require 'astute/ruby_removed_functions'
require 'json'
require 'logger'
require 'shellwords'
require 'active_support/all'
require 'astute/ext/exception'
require 'astute/ext/deep_copy'

4
lib/astute/cli/deploy_schema.yaml
View File

@ -28,7 +28,7 @@ mapping:
enum: ["primary-controller", "controller", "storage", "swift-proxy", "primary-swift-proxy", "compute", "quantum"]
"status":
type: text
enum: ["ready", "provisioned", "discover"]
enum: ["ready", "provisioned", "provisioning", "discover"]
# Quantum true
"public_br":
type: text
@ -331,7 +331,7 @@ mapping:
desc: Use HTTP or HTTPS for OpenStack dashboard (Horizon)
"compute_scheduler_driver":
type: text
enum: ['nova.scheduler.multi.MultiScheduler']
enum: ['nova.scheduler.multi.MultiScheduler', 'nova.scheduler.filter_scheduler.FilterScheduler']
desc: Nova scheduler driver class
"use_unicast_corosync":
type: bool

61
lib/astute/cli/enviroment.rb
View File

@ -13,7 +13,6 @@
# under the License.
require 'yaml'
require 'json'
require 'rest-client'
require 'astute/ext/hash'
require 'astute/cli/enviroment'
@ -26,11 +25,12 @@ module Astute
POWER_INFO_KEYS = ['power_type', 'power_user', 'power_pass', 'netboot_enabled']
ID_KEYS = ['id', 'uid']
COMMON_NODE_KEYS = ['name_servers']
COMMON_NODE_KEYS = ['name_servers', 'profile']
KS_META_KEYS = ['mco_enable', 'mco_vhost', 'mco_pskey', 'mco_user', 'puppet_enable',
'install_log_2_syslog', 'mco_password', 'puppet_auto_setup', 'puppet_master',
'mco_auto_setup', 'auth_key', 'puppet_version', 'mco_connector', 'mco_host']
PROVISIONING_NET_KEYS = ['ip', 'power_address', 'mac', 'fqdn']
NETWORK_KEYS = ['ip', 'mac', 'fqdn']
PROVISIONING_NET_KEYS = ['power_address']
PROVISION_OPERATIONS = [:provision, :provision_and_deploy]
DEPLOY_OPERATIONS = [:deploy, :provision_and_deploy]
@ -54,11 +54,12 @@ module Astute
# Common section
node['meta'] ||= {}
define_provisioning_network(node)
define_network_ids(node)
define_id_and_uid(node)
# Provision section
if PROVISION_OPERATIONS.include? operation
define_power_address(node)
define_interfaces_and_interfaces_extra(node)
define_ks_spaces(node)
define_power_info(node)
@ -82,9 +83,10 @@ module Astute
errors.each do |e|
if e.message.include?("is undefined")
Astute.logger.debug "WARNING: [#{e.path}] #{e.message}"
Astute.logger.warn "[#{e.path}] #{e.message}"
else
Astute.logger.error "ERROR: [#{e.path}] #{e.message}"
Astute.logger.error "[#{e.path}] #{e.message}"
$stderr.puts "[#{e.path}] #{e.message}"
end
end
@ -105,7 +107,7 @@ module Astute
errors = []
['quantum_parameters', 'quantum_access'].each do |param|
errors << param unless @config['attributes'].present?(param)
errors << param unless @config['attributes'][param].present?
end
errors.each do |field|
msg = "#{field} is required when quantim is true"
@ -159,7 +161,6 @@ module Astute
)
end
# Set meta/disks section for node. This data used in provision to calculate the percentage
# completion of the installation process.
# Example result for node['meta']
@ -207,37 +208,39 @@ module Astute
define_parameters(node, 'common_ks_meta', KS_META_KEYS, node['ks_meta'])
end
# Add duplicates params to node: ip, power_address, mac, fqdn
def define_provisioning_network(node)
provision_eth = node['interfaces'].find {|eth| eth['use_for_provision'] } rescue nil
# Add duplicates network params to node: ip, mac, fqdn
def define_network_ids(node)
network_eth = node['interfaces'].find {|eth| eth['use_for_provision'] } rescue nil
if provision_eth
if provision_eth.absent?('ip_address')
node['mac'] = provision_eth['mac_address']
if network_eth
if network_eth['ip_address'].blank?
node['mac'] = network_eth['mac_address']
api_node = find_node_api_data(node)
api_provision_eth = api_node['meta']['interfaces'].find { |n| n['mac'].to_s.upcase == provision_eth['mac_address'].to_s.upcase }
provision_eth['ip_address'] = api_provision_eth['ip']
provision_eth['netmask'] = api_provision_eth['netmask']
api_provision_eth = api_node['meta']['interfaces'].find { |n| n['mac'].to_s.upcase == network_eth['mac_address'].to_s.upcase }
network_eth['ip_address'] = api_provision_eth['ip']
network_eth['netmask'] = api_provision_eth['netmask']
end
#define_parameters(node, 'use_for_provision', PROVISIONING_NET_KEYS)
node.reverse_merge!(
'ip' => provision_eth['ip_address'],
'power_address' => provision_eth['ip_address'],
'mac' => provision_eth['mac_address'],
'fqdn' => provision_eth['dns_name']
'ip' => network_eth['ip_address'],
'mac' => network_eth['mac_address'],
'fqdn' => network_eth['dns_name']
)
provision_eth.delete('use_for_provision')
network_eth.delete('use_for_provision')
end
absent_keys = node.absent_keys(PROVISIONING_NET_KEYS)
absent_keys = node.absent_keys(NETWORK_KEYS)
if !absent_keys.empty?
raise Enviroment::ValidationError, "Please set 'use_for_provision' parameter
for #{node['name']} or set manually #{absent_keys.each {|k| p k}}"
end
end
# Add duplicates network params to node: power_address
def define_power_address(node)
node['power_address'] = node['ip'] or raise Enviroment::ValidationError, "Please
set 'power_address' parameter for #{node['name']}"
end
# Extend blocks interfaces and interfaces_extra to old formats:
# interfaces:
@ -344,12 +347,12 @@ module Astute
# }]
# Example result for 'ks_spaces' param: "[{"type": "disk", "id": "disk/by-path/pci-0000:00:0d.0-scsi-0:0:0:0", "volumes": [{"type": "boot", "size": 300}, {"mount": "/boot", "type": "raid", "size": 200}, {"type": "lvm_meta", "name": "os", "size": 64}, {"size": 11264, "type": "pv", "vg": "os"}, {"type": "lvm_meta", "name": "image", "size": 64}, {"size": 4492, "type": "pv", "vg": "image"}], "size": 16384}]"
def define_ks_spaces(node)
if node['ks_meta'].present? 'ks_spaces'
if node['ks_meta']['ks_spaces'].present?
node['ks_meta'].delete('ks_disks')
return
end
if node['ks_meta'].absent? 'ks_disks'
if node['ks_meta']['ks_disks'].blank?
raise Enviroment::ValidationError, "Please set 'ks_disks' or 'ks_spaces' parameter
in section ks_meta for #{node['name']}"
end

5
lib/astute/cli/provision_schema.yaml
View File

@ -42,6 +42,10 @@ mapping:
"name_servers":
type: text
required: true
"profile":
type: text
enum: ["centos-x86_64", "ubuntu_1204_x86_64", 'rhel-x86_64']
desc: Cobbler profile for the node.
"common_ks_meta":
type: map
mapping:
@ -119,7 +123,6 @@ mapping:
desc: Fully-qualified domain name of the node
"profile":
type: text
required: true
enum: ["centos-x86_64", "ubuntu_1204_x86_64", 'rhel-x86_64']
desc: Cobbler profile for the node.
"ip":

27
lib/astute/ext/hash.rb
View File

@ -15,33 +15,8 @@
class Hash
# The value of the existing keys are not overridden
def reverse_merge(another_hash)
another_hash.merge(self)
end
def reverse_merge!(another_hash)
replace(reverse_merge(another_hash))
end
def absent_keys(array)
array.select { |key| absent?(key) }
end
def absent?(key)
self[key].nil? || (self[key].respond_to?(:empty?) && self[key].empty?)
end
def present?(key)
!absent?(key)
end
def deep_merge(other_hash)
self.merge(other_hash) do |key, oldval, newval|
oldval = oldval.to_hash if oldval.respond_to?(:to_hash)
newval = newval.to_hash if newval.respond_to?(:to_hash)
oldval.class.to_s == 'Hash' && newval.class.to_s == 'Hash' ? oldval.deep_merge(newval) : newval
end
array.select { |key| self[key].blank? }
end
end