diff --git a/resources/neutron_server_puppet/actions/run.pp b/resources/neutron_server_puppet/actions/run.pp index 0d6d48c8..47fcb2cc 100644 --- a/resources/neutron_server_puppet/actions/run.pp +++ b/resources/neutron_server_puppet/actions/run.pp @@ -17,7 +17,6 @@ $auth_tenant = $resource['input']['auth_tenant']['value'] $auth_user = $resource['input']['auth_user']['value'] $auth_protocol = $resource['input']['auth_protocol']['value'] $auth_uri = $resource['input']['auth_uri']['value'] -$database_connection = $resource['input']['database_connection']['value'] $database_max_retries = $resource['input']['database_max_retries']['value'] $database_idle_timeout = $resource['input']['database_idle_timeout']['value'] $database_retry_interval = $resource['input']['database_retry_interval']['value'] @@ -35,8 +34,6 @@ $max_l3_agents_per_router = $resource['input']['max_l3_agents_per_router']['val $min_l3_agents_per_router = $resource['input']['min_l3_agents_per_router']['value'] $l3_ha_net_cidr = $resource['input']['l3_ha_net_cidr']['value'] $mysql_module = $resource['input']['mysql_module']['value'] -$sql_connection = $resource['input']['sql_connection']['value'] -$connection = $resource['input']['connection']['value'] $sql_max_retries = $resource['input']['sql_max_retries']['value'] $max_retries = $resource['input']['max_retries']['value'] $sql_idle_timeout = $resource['input']['sql_idle_timeout']['value'] diff --git a/resources/neutron_server_puppet/meta.yaml b/resources/neutron_server_puppet/meta.yaml index b32e0b2e..4e4af5b7 100644 --- a/resources/neutron_server_puppet/meta.yaml +++ b/resources/neutron_server_puppet/meta.yaml @@ -19,10 +19,10 @@ input: value: db_name: schema: str! - value: + value: db_host: schema: str! - value: + value: package_ensure: schema: str @@ -54,9 +54,6 @@ input: auth_uri: schema: str value: - database_connection: - schema: str - value: 'sqlite:////var/lib/neutron/ovs.sqlite' database_max_retries: schema: int value: 10 @@ -108,12 +105,6 @@ input: mysql_module: schema: str value: - sql_connection: - schema: str - value: - connection: - schema: str - value: sql_max_retries: schema: str value: