From 4d579beec6b850dd46948aba2dd26c3d776cc73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw?= Date: Thu, 29 Sep 2016 14:38:51 +0200 Subject: [PATCH] Configure headless only when used per se Partial-Bug: #1624507 Change-Id: Ibbf7b7695d188f42ec4a3d4ddb2afe29ea61c576 --- .../puppet/modules/contrail/manifests/compute/vrouter.pp | 8 ++++---- .../puppet/modules/contrail/manifests/init.pp | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deployment_scripts/puppet/modules/contrail/manifests/compute/vrouter.pp b/deployment_scripts/puppet/modules/contrail/manifests/compute/vrouter.pp index e815ca9a3..80cb96578 100644 --- a/deployment_scripts/puppet/modules/contrail/manifests/compute/vrouter.pp +++ b/deployment_scripts/puppet/modules/contrail/manifests/compute/vrouter.pp @@ -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; diff --git a/deployment_scripts/puppet/modules/contrail/manifests/init.pp b/deployment_scripts/puppet/modules/contrail/manifests/init.pp index 9d0558d6d..56ef138a8 100644 --- a/deployment_scripts/puppet/modules/contrail/manifests/init.pp +++ b/deployment_scripts/puppet/modules/contrail/manifests/init.pp @@ -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']