openstack
/
fuel-library
Code Issues Proposed changes

Revert "Use eval_generate instead of generate" 

Reverting the commit due to False-positive FUEL CI which blocks master.

Example of failure:

https://ci.fuel-infra.org/job/master.fuel-library.pkgs.ubuntu.neutron_vlan_ha/5655/artifact/logs/5655/fail_error_deploy_neutron_vlan_ha-fuel-snapshot-2016-02-02_11-51-00.tar.xz.filtered.log

This reverts commit 54d181c47f.

Change-Id: Iceb45d27d3c2ee150cfdb0fa58ab12dae3bb27c7
Related-bug: #1538526
This commit is contained in:
Vladimir Kuklin 2016-02-02 12:58:58 +00:00
parent 54d181c47f
commit a03fcbe7c5
11 changed files with 74 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/puppet/osnailyfacter/lib/puppet/type/override_resources.rb
View File

@ -24,9 +24,6 @@ Puppet::Type.newtype(:override_resources) do
parameters.each do |parameter, value|
resource[parameter] = value
end
if parameters.has_key?('value') and resource.property('ensure')
resource['ensure'] = :present
end
end
def create_resource(type, title, parameters = {})
@ -34,7 +31,7 @@ Puppet::Type.newtype(:override_resources) do
Puppet::Type.type(type.to_sym).new(parameters)
end
def eval_generate
def generate
type = self[:type]
data = self[:data] || {}
defaults = self[:defaults] || {}

12
deployment/puppet/osnailyfacter/modular/keystone/keystone.pp
View File

@ -1,11 +1,5 @@
notice('MODULAR: keystone.pp')
# Override confguration options
$override_configuration = hiera_hash('configuration', {})
override_resources { 'keystone_config':
data => $override_configuration['keystone_config']
} ~> Service['httpd']
$network_scheme = hiera_hash('network_scheme', {})
$network_metadata = hiera_hash('network_metadata', {})
prepare_network_config($network_scheme)
@ -273,3 +267,9 @@ if ($::operatingsystem == 'Ubuntu') {
package_name => 'keystone',
}
}
# Override confguration options
$override_configuration = hiera_hash('configuration', {})
override_resources { 'keystone_config':
data => $override_configuration['keystone_config']
}

21
deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
View File

@ -1,16 +1,7 @@
notice('MODULAR: openstack-controller.pp')
$override_configuration = hiera_hash('configuration', {})
# override nova options
override_resources { 'nova_config':
data => $override_configuration['nova_config']
} ~> Exec['post-nova_config']
# override nova-api options
override_resources { 'nova_paste_api_ini':
data => $override_configuration['nova_paste_api_ini']
} ~> Exec['post-nova_config']
$network_scheme = hiera_hash('network_scheme', {})
$override_configuration = hiera_hash('configuration', {})
$network_metadata = hiera_hash('network_metadata', {})
prepare_network_config($network_scheme)
@ -280,6 +271,16 @@ nova_config {
'DEFAULT/ram_weight_multiplier': value => '1.0'
}
# override nova options
override_resources { 'nova_config':
data => $override_configuration['nova_config']
}
# override nova-api options
override_resources { 'nova_paste_api_ini':
data => $override_configuration['nova_paste_api_ini']
}
if $storage_hash['volumes_ceph'] {
package { 'open-iscsi':
ensure => present,

14
deployment/puppet/osnailyfacter/modular/openstack-network/agents/dhcp.pp
View File

@ -2,14 +2,6 @@ notice('MODULAR: openstack-network/agents/dhcp.pp')
$use_neutron = hiera('use_neutron', false)
if $use_neutron {
# override neutron options
$override_configuration = hiera_hash('configuration', {})
override_resources { 'neutron_dhcp_agent_config':
data => $override_configuration['neutron_dhcp_agent_config']
} ~> Service['neutron-dhcp-service']
}
class neutron {}
class { 'neutron' :}
@ -44,4 +36,10 @@ if $use_neutron {
ensure => 'installed',
}
# override neutron options
$override_configuration = hiera_hash('configuration', {})
override_resources { 'neutron_dhcp_agent_config':
data => $override_configuration['neutron_dhcp_agent_config']
}
}

24
deployment/puppet/osnailyfacter/modular/openstack-network/agents/l3.pp
View File

@ -1,22 +1,16 @@
notice('MODULAR: openstack-network/agents/l3.pp')
$use_neutron = hiera('use_neutron', false)
$neutron_advanced_config = hiera_hash('neutron_advanced_configuration', { })
$dvr = pick($neutron_advanced_config['neutron_dvr'], false)
$controller = roles_include(['controller', 'primary-controller'])
$compute = roles_include('compute')
if $use_neutron and ($controller or ($dvr and $compute)) {
# override neutron options
$override_configuration = hiera_hash('configuration', {})
override_resources { 'neutron_l3_agent_config':
data => $override_configuration['neutron_l3_agent_config']
} ~> Service['neutron-l3']
}
class neutron {}
class { 'neutron' :}
$neutron_advanced_config = hiera_hash('neutron_advanced_configuration', { })
$dvr = pick($neutron_advanced_config['neutron_dvr'], false)
$controller = roles_include(['controller', 'primary-controller'])
$compute = roles_include('compute')
if $use_neutron and ($controller or ($dvr and $compute)) {
$debug = hiera('debug', true)
$metadata_port = '8775'
@ -60,4 +54,10 @@ if $use_neutron and ($controller or ($dvr and $compute)) {
ensure => 'installed',
}
# override neutron options
$override_configuration = hiera_hash('configuration', {})
override_resources { 'neutron_l3_agent_config':
data => $override_configuration['neutron_l3_agent_config']
}
}

14
deployment/puppet/osnailyfacter/modular/openstack-network/agents/metadata.pp
View File

@ -8,14 +8,6 @@ $compute = roles_include($neutron_compute_roles)
$neutron_advanced_config = hiera_hash('neutron_advanced_configuration', { })
$dvr = pick($neutron_advanced_config['neutron_dvr'], false)
if $use_neutron and ($controller or ($dvr and $compute)) {
# override neutron options
$override_configuration = hiera_hash('configuration', {})
override_resources { 'neutron_metadata_agent_config':
data => $override_configuration['neutron_metadata_agent_config']
} ~> Service['neutron-metadata']
}
class neutron {}
class { 'neutron' :}
@ -69,4 +61,10 @@ if $use_neutron and ($controller or ($dvr and $compute)) {
ensure => 'installed',
}
# override neutron options
$override_configuration = hiera_hash('configuration', {})
override_resources { 'neutron_metadata_agent_config':
data => $override_configuration['neutron_metadata_agent_config']
}
}

14
deployment/puppet/osnailyfacter/modular/openstack-network/plugins/ml2.pp
View File

@ -3,14 +3,6 @@ notice('MODULAR: openstack-network/plugins/ml2.pp')
$use_neutron = hiera('use_neutron', false)
$compute = roles_include('compute')
if $use_neutron {
# override neutron options
$override_configuration = hiera_hash('configuration', {})
override_resources { 'neutron_agent_ovs':
data => $override_configuration['neutron_agent_ovs']
} ~> Service['neutron-ovs-agent-service']
}
class neutron {}
class { 'neutron' :}
@ -162,4 +154,10 @@ if $use_neutron {
ensure => 'installed',
}
# override neutron options
$override_configuration = hiera_hash('configuration', {})
override_resources { 'neutron_agent_ovs':
data => $override_configuration['neutron_agent_ovs']
}
}

26
deployment/puppet/osnailyfacter/modular/openstack-network/server-config.pp
View File

@ -3,20 +3,6 @@ notice('MODULAR: openstack-network/server-config.pp')
$use_neutron = hiera('use_neutron', false)
$compute = roles_include('compute')
if $use_neutron {
# override neutron options
$override_configuration = hiera_hash('configuration', {})
override_resources { 'neutron_api_config':
data => $override_configuration['neutron_api_config']
} ~> Service['neutron-server']
override_resources { 'neutron_config':
data => $override_configuration['neutron_config']
} ~> Service['neutron-server']
override_resources { 'neutron_plugin_ml2':
data => $override_configuration['neutron_plugin_ml2']
} ~> Service['neutron-server']
}
class neutron { }
class { 'neutron' : }
@ -216,4 +202,16 @@ if $use_neutron {
ensure => 'installed',
}
# override neutron options
$override_configuration = hiera_hash('configuration', {})
override_resources { 'neutron_api_config':
data => $override_configuration['neutron_api_config']
}
override_resources { 'neutron_config':
data => $override_configuration['neutron_config']
}
override_resources { 'neutron_plugin_ml2':
data => $override_configuration['neutron_plugin_ml2']
}
}

19
deployment/puppet/osnailyfacter/modular/roles/compute.pp
View File

@ -5,16 +5,6 @@ $override_configuration = hiera_hash('configuration', {})
$network_metadata = hiera_hash('network_metadata', {})
prepare_network_config($network_scheme)
# override nova options
override_resources { 'nova_config':
data => $override_configuration['nova_config']
} ~> Exec['post-nova_config']
# override nova-api options
override_resources { 'nova_paste_api_ini':
data => $override_configuration['nova_paste_api_ini']
} ~> Exec['post-nova_config']
# Pulling hiera
$compute_hash = hiera_hash('compute', {})
$public_int = hiera('public_int', undef)
@ -375,6 +365,15 @@ if $use_monit_real {
}
}
# override nova options
override_resources { 'nova_config':
data => $override_configuration['nova_config']
}
# override nova-api options
override_resources { 'nova_paste_api_ini':
data => $override_configuration['nova_paste_api_ini']
}
########################################################################

6
deployment/puppet/osnailyfacter/spec/unit/type/override_resources_spec.rb
View File

@ -25,21 +25,21 @@ describe Puppet::Type.type(:override_resources) do
it 'should be a resource type to override' do
expect {
@overres[:type] = ''
@overres.eval_generate
@overres.generate
}.to raise_error(Puppet::Error, /Title should be a resource type to override!$/)
end
it 'should contain resource hash' do
expect {
@overres[:data] = 'string => data'
@overres.eval_generate
@overres.generate
}.to raise_error(Puppet::Error, /Data should contain resource hash!$/)
end
it 'should contain resource defaults hash' do
expect {
@overres[:defaults] = 'string => data'
@overres.eval_generate
@overres.generate
}.to raise_error(Puppet::Error, /Defaults should contain resource defaults hash!$/)
end

9
tests/noop/spec/lib/helpers.rb
View File

@ -45,13 +45,8 @@ class Noop
catalog = catalog.call if catalog.is_a? Proc
ral_catalog = catalog.to_ral
ral_catalog.resources.each do |resource|
if resource.respond_to? :generate
generated = resource.generate
elsif resource.respond_to? :eval_generate
generated = resource.eval_generate
else
next
end
next unless resource.respond_to? :generate
generated = resource.generate
next unless generated.is_a? Array
generated.each do |generated_resource|
next unless generated_resource.is_a? Puppet::Type