diff --git a/packstack/puppet/templates/provision_tempest.pp b/packstack/puppet/templates/provision_tempest.pp
index 78242bb55..40c130c74 100644
--- a/packstack/puppet/templates/provision_tempest.pp
+++ b/packstack/puppet/templates/provision_tempest.pp
@@ -75,45 +75,45 @@ package {'python-openstackclient':
 }
 
 class { '::tempest':
-  admin_username            => $admin_username,
+  admin_domain_name         => $admin_domain_name,
   admin_password            => $admin_password,
   admin_tenant_name         => $admin_tenant_name,
-  admin_domain_name         => $admin_domain_name,
-  username                  => $username,
-  tenant_name               => $tenant_name,
-  password                  => $password,
-  identity_uri              => $identity_uri,
-  identity_uri_v3           => $identity_uri_v3,
+  admin_username            => $admin_username,
+  allow_tenant_isolation    => $allow_tenant_isolation,
+  aodh_available            => $aodh_available,
   auth_version              => $auth_version,
+  ceilometer_available      => $ceilometer_available,
+  change_password_available => $change_password_available,
   configure_images          => $configure_images,
   configure_networks        => $configure_networks,
+  debug                     => $debug,
+  glance_available          => $glance_available,
+  heat_available            => $heat_available,
+  horizon_available         => $horizon_available,
+  identity_uri              => $identity_uri,
+  identity_uri_v3           => $identity_uri_v3,
+  image_alt_ssh_user        => $image_alt_ssh_user,
+  image_name_alt            => $image_name_alt,
   image_name                => $image_name,
   image_ssh_user            => $image_ssh_user,
-  image_name_alt            => $image_name_alt,
-  image_alt_ssh_user        => $image_alt_ssh_user,
-  public_network_name       => $public_network_name,
-  resize_available          => $resize_available,
-  change_password_available => $change_password_available,
-  allow_tenant_isolation    => $allow_tenant_isolation,
   log_file                  => $log_file,
-  use_stderr                => $use_stderr,
-  debug                     => $debug,
-  public_router_id          => $public_router_id,
-  glance_available          => $glance_available,
-  horizon_available         => $horizon_available,
-  nova_available            => $nova_available,
   neutron_available         => $neutron_available,
-  ceilometer_available      => $ceilometer_available,
-  aodh_available            => $aodh_available,
-  trove_available           => $trove_available,
+  nova_available            => $nova_available,
+  password                  => $password,
+  public_network_name       => $public_network_name,
+  public_router_id          => $public_router_id,
+  resize_available          => $resize_available,
   sahara_available          => $sahara_available,
-  heat_available            => $heat_available,
-  swift_available           => $swift_available,
-  tempest_repo_uri          => $tempest_repo_uri,
-  tempest_clone_path        => $tempest_clone_path,
-  tempest_clone_owner       => $tempest_clone_owner,
-  tempest_repo_revision     => $tempest_repo_revision,
   setup_venv                => $setup_venv,
+  swift_available           => $swift_available,
+  tempest_clone_owner       => $tempest_clone_owner,
+  tempest_clone_path        => $tempest_clone_path,
+  tempest_repo_revision     => $tempest_repo_revision,
+  tempest_repo_uri          => $tempest_repo_uri,
+  tenant_name               => $tenant_name,
+  trove_available           => $trove_available,
+  username                  => $username,
+  use_stderr                => $use_stderr,
 }
 
 tempest_config { 'object-storage/operator_role':