x
/
fuel-plugin-contrail
Code Issues Proposed changes

Fix nova-compute.conf.erb 

- Fix nova.conf settings

Change-Id: I8dfdd9f20ea660ca2762e32c322567580617205c
This commit is contained in:
Vitalii Kovalchuk 2016-09-07 10:06:46 +00:00
parent f941bae964
commit c9c72dfdc9
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment_scripts/puppet/modules/contrail/files/nova-compute.conf.erb_fixed
View File

@ -1,6 +1,3 @@
<%-
contrail_data=scope.function_hiera(['contrail'])
-%>
[DEFAULT]
compute_driver=nova.virt.vmwareapi.contrailVCDriver
log_file=nova-compute-vmware-<%= @availability_zone_name %>-<%= @service_name %>.log
@ -15,7 +12,6 @@ cache_prefix=$host
<% @vc_cluster.split(',').map(&:strip).each do |cluster_name| -%>
cluster_name=<%= cluster_name %>
<% end %>
vcenter_dvswitch=<%= contrail_data['dvs_internal'] %>
host_ip=<%= @vc_host %>
host_username=<%= @vc_user %>
@ -39,4 +35,3 @@ wsdl_location=<%= @wsdl_location %>
[libvirt]
virt_type=vmwareapi

25
deployment_scripts/puppet/modules/contrail/manifests/compute/vmware.pp
View File

@ -15,16 +15,20 @@
class contrail::compute::vmware {
nova_config {
'DEFAULT/network_api_class': value => 'nova.network.neutronv2.api.API';
'DEFAULT/security_group_api': value => 'neutron';
'DEFAULT/firewall_driver': value => 'nova.virt.firewall.NoopFirewallDriver';
'DEFAULT/heal_instance_info_cache_interval': value => '0';
'neutron/url': value => "http://${contrail::mos_mgmt_vip}:9696";
'neutron/url_timeout': value => '300';
'neutron/admin_auth_url': value => "http://${contrail::mos_mgmt_vip}:35357/v2.0/";
'neutron/admin_tenant_name': value => 'services';
'neutron/admin_username': value => 'neutron';
'neutron/admin_password': value => $contrail::service_token;
'neutron/auth_type': value => 'password';
'neutron/auth_url': value => "http://${contrail::mos_mgmt_vip}:35357/";
'neutron/username': value => 'neutron';
'neutron/password': value => $contrail::service_token;
'neutron/project_name': value => 'services';
'neutron/url': value => "http://${contrail::mos_mgmt_vip}:9696";
}
ini_setting { 'vmware-int-dvs':
ensure => present,
path => '/etc/nova/nova-compute.conf',
section => 'vmware',
setting => 'vcenter_dvswitch',
value => $contrail::dvs_internal,
}
# Config file
@ -49,6 +53,7 @@ class contrail::compute::vmware {
enable => true,
}
Ini_setting['vmware-int-dvs'] ->
Nova_Config <||> ~>
service { 'nova-compute':
ensure => running,