From b9045e09939fba302ccc49142f3bfd91372a9434 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Wed, 5 Aug 2015 14:57:14 +0200 Subject: [PATCH] Fix removed sql_con Signed-off-by: Bogdan Dobrelya --- resources/neutron_plugins_ovs_puppet/actions/run.pp | 1 - resources/neutron_server_puppet/README.md | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/resources/neutron_plugins_ovs_puppet/actions/run.pp b/resources/neutron_plugins_ovs_puppet/actions/run.pp index 0bae144..853cc22 100644 --- a/resources/neutron_plugins_ovs_puppet/actions/run.pp +++ b/resources/neutron_plugins_ovs_puppet/actions/run.pp @@ -8,7 +8,6 @@ $db_password = $resource['input']['db_password']['value'] $db_name = $resource['input']['db_name']['value'] $package_ensure = $resource['input']['package_ensure']['value'] -$sql_connection = $resource['input']['sql_connection']['value'] $sql_max_retries = $resource['input']['sql_max_retries']['value'] $sql_idle_timeout = $resource['input']['sql_idle_timeout']['value'] $reconnect_interval = $resource['input']['reconnect_interval']['value'] diff --git a/resources/neutron_server_puppet/README.md b/resources/neutron_server_puppet/README.md index be11e35..f0cc553 100644 --- a/resources/neutron_server_puppet/README.md +++ b/resources/neutron_server_puppet/README.md @@ -61,12 +61,9 @@ source https://github.com/openstack/puppet-neutron/blob/5.1.0/manifests/server.p ``database_connection`` (optional) Connection url for the neutron database. (Defaults to 'sqlite:////var/lib/neutron/ovs.sqlite') - - ``sql_connection`` - DEPRECATED: Use database_connection instead. - - ``connection`` - DEPRECATED: Use database_connection instead. + Note: for this resource it is decomposed to the + 'db_host', 'db_port', 'db_user', 'db_password' inputs + due to implementation limitations ``database_max_retries`` (optional) Maximum database connection retries during startup.