x
/
fuel-plugin-contrail
Code Issues Proposed changes

Configure headless only when used per se 

Partial-Bug: #1624507

Change-Id: Ibbf7b7695d188f42ec4a3d4ddb2afe29ea61c576
This commit is contained in:
Przemysław 2016-09-29 14:38:51 +02:00
parent 8d4ce2e64e
commit 4d579beec6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment_scripts/puppet/modules/contrail/manifests/compute/vrouter.pp
View File

@ -159,12 +159,12 @@ class contrail::compute::vrouter {
'DEFAULT/log_flow': value => '1';
'DEFAULT/use_syslog': value => '1';
'DEFAULT/syslog_facility': value => 'LOG_LOCAL0';
'DEFAULT/headless_mode': value => $contrail::headless_mode;
'DISCOVERY/server': value => $contrail::contrail_private_vip;
'DEFAULT/headless_mode': value => $::contrail::headless_mode;
'DISCOVERY/server': value => $::contrail::contrail_private_vip;
'DISCOVERY/max_control_nodes': value => '2';
'HYPERVISOR/type': value => 'kvm';
'METADATA/metadata_proxy_secret': value => $contrail::metadata_secret;
'NETWORKS/control_network_ip': value => $contrail::address;
'METADATA/metadata_proxy_secret': value => $::contrail::metadata_secret;
'NETWORKS/control_network_ip': value => $::contrail::address;
'VIRTUAL-HOST-INTERFACE/name': value => 'vhost0';
'VIRTUAL-HOST-INTERFACE/ip': value => "${contrail::address}/${contrail::netmask_short}";
'VIRTUAL-HOST-INTERFACE/physical_interface': value => $phys_dev;

1
deployment_scripts/puppet/modules/contrail/manifests/init.pp
View File

@ -55,6 +55,7 @@ class contrail {
$vrouter_core_mask = pick($settings['vrouter_core_mask'], '0x3')
$vr_flow_entries = pick($settings['vr_flow_entries'], '524288')
$vr_mpls_labels = pick($settings['vr_mpls_labels'], '5120')
if has_key($settings, 'headless_mode') { $headless_mode = $settings['headless_mode'] }
# VIPs
$mos_mgmt_vip = $network_metadata['vips']['management']['ipaddr']