From 8d07b67026f5807b30cb5982b13a754d760b05c8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 16 Jun 2022 10:03:14 +0900 Subject: [PATCH] ovn: Accept arrays for ovn_*_connection parameters These parameters are regarded as StrOpt, but can accept comma-seprated strings. Change-Id: I77bd90ad2384f8649f744aa2750591cafdff0498 --- manifests/agents/ovn_metadata.pp | 2 +- manifests/plugins/ml2/ovn.pp | 4 ++-- spec/classes/neutron_plugins_ml2_ovn_spec.rb | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/manifests/agents/ovn_metadata.pp b/manifests/agents/ovn_metadata.pp index e7a5aac59..11b93f9c8 100644 --- a/manifests/agents/ovn_metadata.pp +++ b/manifests/agents/ovn_metadata.pp @@ -183,7 +183,7 @@ class neutron::agents::ovn_metadata ( 'ovs/ovsdb_connection_timeout': value => $ovsdb_connection_timeout; 'ovn/ovsdb_retry_max_interval': value => $ovsdb_retry_max_interval; 'ovn/ovsdb_probe_interval': value => $ovsdb_probe_interval; - 'ovn/ovn_sb_connection': value => $ovn_sb_connection; + 'ovn/ovn_sb_connection': value => join(any2array($ovn_sb_connection), ','); 'ovn/ovn_sb_private_key': value => $ovn_sb_private_key; 'ovn/ovn_sb_certificate': value => $ovn_sb_certificate; 'ovn/ovn_sb_ca_cert': value => $ovn_sb_ca_cert; diff --git a/manifests/plugins/ml2/ovn.pp b/manifests/plugins/ml2/ovn.pp index f3812ef28..e289d2569 100644 --- a/manifests/plugins/ml2/ovn.pp +++ b/manifests/plugins/ml2/ovn.pp @@ -155,8 +155,8 @@ class neutron::plugins::ml2::ovn( } neutron_plugin_ml2 { - 'ovn/ovn_nb_connection' : value => $ovn_nb_connection; - 'ovn/ovn_sb_connection' : value => $ovn_sb_connection; + 'ovn/ovn_nb_connection' : value => join(any2array($ovn_nb_connection), ','); + 'ovn/ovn_sb_connection' : value => join(any2array($ovn_sb_connection), ','); 'ovn/ovn_nb_private_key' : value => $ovn_nb_private_key; 'ovn/ovn_nb_certificate' : value => $ovn_nb_certificate; 'ovn/ovn_nb_ca_cert' : value => $ovn_nb_ca_cert; diff --git a/spec/classes/neutron_plugins_ml2_ovn_spec.rb b/spec/classes/neutron_plugins_ml2_ovn_spec.rb index f4079ec80..03c218e97 100644 --- a/spec/classes/neutron_plugins_ml2_ovn_spec.rb +++ b/spec/classes/neutron_plugins_ml2_ovn_spec.rb @@ -130,11 +130,15 @@ describe 'neutron::plugins::ml2::ovn' do context 'with parameters set by arrays' do let :params do { - :dns_servers => ['8.8.8.8', '10.10.10.10'], + :ovn_nb_connection => ['tcp:192.0.2.11:6641', 'tcp:192.0.2.12:6641'], + :ovn_sb_connection => ['tcp:192.0.2.11:6642', 'tcp:192.0.2.12:6642'], + :dns_servers => ['8.8.8.8', '10.10.10.10'], } end it 'should configure comma-separated strings' do + should contain_neutron_plugin_ml2('ovn/ovn_nb_connection').with_value(p[:ovn_nb_connection].join(',')) + should contain_neutron_plugin_ml2('ovn/ovn_sb_connection').with_value(p[:ovn_sb_connection].join(',')) should contain_neutron_plugin_ml2('ovn/dns_servers').with_value(p[:dns_servers].join(',')) end end