openstack/fuel-library
Code Issues Proposed changes

Merge "Fix internal Neutron network name for Sahara templates"

Browse Source
This commit is contained in:
Jenkins 2015-12-09 15:06:08 +00:00 committed by Gerrit Code Review
commit 0302f8b495
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/osnailyfacter/modular/sahara/sahara.pp
View File

@ -11,6 +11,7 @@ $primary_controller = hiera('primary_controller')
$public_vip = hiera('public_vip')
$database_vip = hiera('database_vip', undef)
$management_vip = hiera('management_vip')
$neutron_config = hiera_hash('neutron_config')
$use_neutron = hiera('use_neutron', false)
$service_endpoint = hiera('service_endpoint')
$syslog_log_facility_sahara = hiera('syslog_log_facility_sahara')
@ -141,6 +142,7 @@ if $sahara_hash['enabled'] {
auth_password => $access_admin['password'],
auth_tenant => $access_admin['tenant'],
auth_uri => "${public_protocol}://${public_address}:5000/v2.0/",
internal_net => try_get_value($neutron_config, 'default_private_net', 'admin_internal_net'),
}
Haproxy_backend_status['keystone-admin'] -> Haproxy_backend_status['sahara']

2
deployment/puppet/sahara_templates/lib/puppet/type/sahara_cluster_template.rb
View File

@ -29,7 +29,7 @@ Puppet::Type.newtype(:sahara_cluster_template) do
newproperty(:neutron_management_network) do
desc 'The id of private neutron network'
defaultto { 'net04' }
defaultto { 'admin_internal_net' }
end
#########################################

2
deployment/puppet/sahara_templates/manifests/create_templates.pp
View File

@ -4,6 +4,7 @@ class sahara_templates::create_templates (
$auth_tenant = 'services',
$auth_password = 'sahara',
$use_neutron = false,
$internal_net = 'admin_internal_net',
) inherits sahara::params {
Sahara_node_group_template {
@ -24,6 +25,7 @@ class sahara_templates::create_templates (
auth_password => $auth_password,
auth_tenant_name => $auth_tenant,
neutron => $use_neutron,
neutron_management_network => $internal_net,
debug => true,
require => Service['sahara-api'],
}

6
deployment/puppet/sahara_templates/spec/unit/puppet/provider/sahara_cluster_template/ruby_spec.rb
View File

@ -65,7 +65,7 @@ describe Puppet::Type.type(:sahara_cluster_template).provider(:ruby) do
let(:list_networks) do
[
OpenStruct.new(:id => '89980ffb-fac3-4b1b-8416-b655fba5095b', :name => 'net04'),
OpenStruct.new(:id => '89980ffb-fac3-4b1b-8416-b655fba5095b', :name => 'admin_internal_net'),
]
end
@ -94,7 +94,7 @@ describe Puppet::Type.type(:sahara_cluster_template).provider(:ruby) do
:plugin_name => "hdp",
:description => "hdp-2",
:name => "hdp-2",
:neutron_management_network => "net04",
:neutron_management_network => "admin_internal_net",
}
end
@ -139,7 +139,7 @@ describe Puppet::Type.type(:sahara_cluster_template).provider(:ruby) do
it 'returns nothing for management_network if Nova-Network' do
resource[:neutron] = false
provider.exists?
expect(resource[:neutron_management_network]).to eq 'net04'
expect(resource[:neutron_management_network]).to eq 'admin_internal_net'
end
it 'can set node group id fro node_groups' do

4
tests/noop/spec/hosts/sahara/sahara_spec.rb
View File

@ -13,6 +13,7 @@ describe manifest do
let(:auth_tenant) { Noop.hiera_structure 'access/tenant' }
let(:service_endpoint) { Noop.hiera('service_endpoint') }
let(:public_vip) { Noop.hiera('public_vip') }
let(:internal_net) { Noop.hiera_structure('neutron_config/default_private_net', 'admin_internal_net') }
let(:network_scheme) do
Noop.hiera_hash 'network_scheme'
@ -148,7 +149,8 @@ describe manifest do
'auth_uri' => "#{public_protocol}://#{public_address}:5000/v2.0/",
'auth_password' => auth_password,
'auth_user' => auth_user,
'auth_tenant' => auth_tenant
'auth_tenant' => auth_tenant,
'internal_net' => internal_net,
)
end