From 0fd755588acf9b70dcd5d387087b57dbee307ee5 Mon Sep 17 00:00:00 2001 From: Janki Chhatbar Date: Wed, 23 May 2018 15:00:39 +0530 Subject: [PATCH] Configure hostname to be FQDN instead of localhost hostname is set to localhost. It should be set to reflect the actual hostname and not localhost. Change-Id: If41ab16a43f98d2c0112a82f811b2137ea5515b2 --- manifests/plugins/ovs/opendaylight.pp | 5 +++++ .../notes/set_hostname_to_FQDN_in_OVS-b5e09c671b74a98d.yaml | 4 ++++ spec/classes/neutron_plugins_ovs_opendaylight_spec.rb | 5 +++++ 3 files changed, 14 insertions(+) create mode 100644 releasenotes/notes/set_hostname_to_FQDN_in_OVS-b5e09c671b74a98d.yaml diff --git a/manifests/plugins/ovs/opendaylight.pp b/manifests/plugins/ovs/opendaylight.pp index b4ba39f46..53021e7c7 100644 --- a/manifests/plugins/ovs/opendaylight.pp +++ b/manifests/plugins/ovs/opendaylight.pp @@ -233,6 +233,11 @@ class neutron::plugins::ovs::opendaylight ( value => $host_id, } + # Set hostname to FQDN instead of default 'localhost' + vs_config {'external_ids:hostname': + value => $host_id, + } + $json_network_types = convert_to_json_string($allowed_network_types) $json_bridge_mappings = convert_to_json_string($provider_mappings) diff --git a/releasenotes/notes/set_hostname_to_FQDN_in_OVS-b5e09c671b74a98d.yaml b/releasenotes/notes/set_hostname_to_FQDN_in_OVS-b5e09c671b74a98d.yaml new file mode 100644 index 000000000..864db9e21 --- /dev/null +++ b/releasenotes/notes/set_hostname_to_FQDN_in_OVS-b5e09c671b74a98d.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Set hostname to FQDN in OVS when deployed with OpenDaylight. \ No newline at end of file diff --git a/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb b/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb index 06c35a715..cbf5adf87 100644 --- a/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb +++ b/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb @@ -136,6 +136,7 @@ describe 'neutron::plugins::ovs::opendaylight' do is_expected.to contain_vs_config('other_config:local_ip') is_expected.not_to contain_vs_config('other_config:provider_mappings') is_expected.to contain_vs_config('external_ids:odl_os_hostconfig_hostid') + is_expected.to contain_vs_config('external_ids:hostname') is_expected.to contain_vs_config('external_ids:odl_os_hostconfig_config_odl_l2') end end @@ -147,6 +148,7 @@ describe 'neutron::plugins::ovs::opendaylight' do is_expected.to contain_vs_config('other_config:local_ip') is_expected.to contain_vs_config('other_config:provider_mappings') is_expected.to contain_vs_config('external_ids:odl_os_hostconfig_hostid') + is_expected.to contain_vs_config('external_ids:hostname') is_expected.to contain_vs_config('external_ids:odl_os_hostconfig_config_odl_l2').with( :value => /bridge_mappings\": {\"default\":\"br-ex\"}/ ) @@ -160,6 +162,7 @@ describe 'neutron::plugins::ovs::opendaylight' do is_expected.to contain_vs_config('other_config:local_ip') is_expected.not_to contain_vs_config('other_config:provider_mappings') is_expected.to contain_vs_config('external_ids:odl_os_hostconfig_hostid') + is_expected.to contain_vs_config('external_ids:hostname') is_expected.to contain_vs_config('external_ids:odl_os_hostconfig_config_odl_l2').with( :value => /vhostuser/, ) @@ -175,6 +178,7 @@ describe 'neutron::plugins::ovs::opendaylight' do is_expected.to contain_vs_config('other_config:local_ip') is_expected.not_to contain_vs_config('other_config:provider_mappings') is_expected.to contain_vs_config('external_ids:odl_os_hostconfig_hostid') + is_expected.to contain_vs_config('external_ids:hostname') is_expected.to contain_vs_config('external_ids:odl_os_hostconfig_config_odl_l2') end end @@ -189,6 +193,7 @@ describe 'neutron::plugins::ovs::opendaylight' do is_expected.to contain_vs_config('other_config:local_ip') is_expected.not_to contain_vs_config('other_config:provider_mappings') is_expected.to contain_vs_config('external_ids:odl_os_hostconfig_hostid') + is_expected.to contain_vs_config('external_ids:hostname') is_expected.to contain_vs_config('external_ids:odl_os_hostconfig_config_odl_l2') end end