Fix common options position and remove unused parameters
Fix common options position and remove unused parameters

Some parameters are common for both systems,
they could be moved out from 'if'.
Some parameters have not been used, so remove them.

Change-Id: I06f6bf0ddb157545fe339e0aeef7834308520da3

openstack/puppet-neutron,openstack/puppet-neutron,CiscoSystems/puppet-neutron,CiscoSystems/puppet-neutron,fuel-infra/puppet-neutron,fuel-infra/puppet-neutron,fuel-infra/puppet-neutron,CiscoSystems/puppet-neutron