diff --git a/manifests/config.pp b/manifests/config.pp
index a724f1498..79fab172f 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -27,6 +27,12 @@
 # [*api_paste_ini*]
 #   (optional) Manage configuration of api-paste.ini
 #
+# [*ovs_agent_config*]
+#   (optional) Manage configuration of openvswitch_agent.ini
+#
+# [*sriov_agent_config*]
+#   (optional) Manage configuration of sriov_agent.ini
+#
 # [*bgpvpn_bagpipe_config*]
 #   (optional) Manage configuration of bagpipe-bgp bgp.conf
 #
@@ -107,6 +113,8 @@
 class neutron::config (
   $server_config                 = {},
   $api_paste_ini                 = {},
+  $ovs_agent_config              = {},
+  $sriov_agent_config            = {},
   $bgpvpn_bagpipe_config         = {},
   $bgpvpn_service_config         = {},
   $l2gw_agent_config             = {},
@@ -146,6 +154,8 @@ will be removed in a future release. Use the api_paste_ini parameter instead.')
 
   validate_legacy(Hash, 'validate_hash', $server_config)
   validate_legacy(Hash, 'validate_hash', $api_paste_ini_real)
+  validate_legacy(Hash, 'validate_hash', $ovs_agent_config)
+  validate_legacy(Hash, 'validate_hash', $sriov_agent_config)
   validate_legacy(Hash, 'validate_hash', $bgpvpn_bagpipe_config)
   validate_legacy(Hash, 'validate_hash', $bgpvpn_service_config)
   validate_legacy(Hash, 'validate_hash', $l2gw_agent_config)
@@ -172,6 +182,8 @@ will be removed in a future release. Use the api_paste_ini parameter instead.')
 
   create_resources('neutron_config', $server_config)
   create_resources('neutron_api_paste_ini', $api_paste_ini_real)
+  create_resources('neutron_agent_ovs', $ovs_agent_config)
+  create_resources('neutron_sriov_agent_config', $sriov_agent_config)
   create_resources('neutron_bgpvpn_bagpipe_config', $bgpvpn_bagpipe_config)
   create_resources('neutron_bgpvpn_service_config', $bgpvpn_service_config)
   create_resources('neutron_l2gw_agent_config', $l2gw_agent_config)
diff --git a/releasenotes/notes/agent-arbitrary-configs-8036223e87f32c2a.yaml b/releasenotes/notes/agent-arbitrary-configs-8036223e87f32c2a.yaml
new file mode 100644
index 000000000..7382cfbeb
--- /dev/null
+++ b/releasenotes/notes/agent-arbitrary-configs-8036223e87f32c2a.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    The following new parameters have been added to support arbitrary
+    configurations for openvsiwtch_agent.ini and sriov_agent.ini
+
+    - ``neutron::config::ovs_agent_config``
+    - ``neutron::config::sriov_agent_config``
diff --git a/spec/classes/neutron_config_spec.rb b/spec/classes/neutron_config_spec.rb
index d4c584f5f..e95898a33 100644
--- a/spec/classes/neutron_config_spec.rb
+++ b/spec/classes/neutron_config_spec.rb
@@ -56,7 +56,9 @@ describe 'neutron::config' do
 
   shared_examples 'neutron_agent_config' do
     let :params do
-      { :l3_agent_config       => config_hash,
+      { :ovs_agent_config      => config_hash,
+        :sriov_agent_config    => config_hash,
+        :l3_agent_config       => config_hash,
         :dhcp_agent_config     => config_hash,
         :metadata_agent_config => config_hash,
         :metering_agent_config => config_hash,
@@ -66,6 +68,18 @@ describe 'neutron::config' do
       }
     end
 
+    it 'configures arbitrary neutron_ovs_agent_config configurations' do
+      should contain_neutron_agent_ovs('DEFAULT/foo').with_value('fooValue')
+      should contain_neutron_agent_ovs('DEFAULT/bar').with_value('barValue')
+      should contain_neutron_agent_ovs('DEFAULT/baz').with_ensure('absent')
+    end
+
+    it 'configures arbitrary neutron_sriov_agent_config configurations' do
+      should contain_neutron_sriov_agent_config('DEFAULT/foo').with_value('fooValue')
+      should contain_neutron_sriov_agent_config('DEFAULT/bar').with_value('barValue')
+      should contain_neutron_sriov_agent_config('DEFAULT/baz').with_ensure('absent')
+    end
+
     it 'configures arbitrary l3_agent_config configurations' do
       should contain_neutron_l3_agent_config('DEFAULT/foo').with_value('fooValue')
       should contain_neutron_l3_agent_config('DEFAULT/bar').with_value('barValue')
@@ -205,6 +219,7 @@ describe 'neutron::config' do
 
       it_behaves_like 'neutron_config'
       it_behaves_like 'neutron_api_paste_ini'
+      it_behaves_like 'neutron_service_config'
       it_behaves_like 'neutron_agent_config'
       it_behaves_like 'neutron_plugin_config'
     end