Refactor provisioning

- Unite demo user and tempest user provisioning

- Unite glance provisioning

- Unite network provisioning

- Run provisioning on correct nodes
  - network and users on controller
  - glance on storage nodes

Change-Id: Ief9d9c224d0f94557f42d64d62e1e9d314db9ad6

packstack/puppet/templates/provision_tempest.pp

@@ -57,32 +57,6 @@ if $provision_tempest_user != '' {
   $nova_available            = true
   $swift_available           = undef
 
-  ## Users
-
-  keystone_tenant { $tenant_name:
-    ensure      => present,
-    enabled     => true,
-    description => 'default tenant',
-  }
-
-  keystone_user { $username:
-    ensure   => present,
-    enabled  => true,
-    password => $password,
-  }
-
-  if hiera('CONFIG_HEAT_INSTALL') == 'y' {
-    keystone_user_role { "${username}@${tenant_name}":
-      ensure => present,
-      roles  => ['_member_', 'heat_stack_owner'],
-    }
-  } else {
-    keystone_user_role { "${username}@${tenant_name}":
-      ensure => present,
-      roles  => ['_member_'],
-    }
-  }
-
   # Support creation of a second glance image
   # distinct from the first, for tempest. It
   # doesn't need to be a different image, just
@@ -107,57 +81,9 @@ if $provision_tempest_user != '' {
     $image_name_alt_real = $image_name
   }
 
-  ## Neutron
-
-  if $neutron_available {
-    $neutron_deps = [Neutron_network[$public_network_name]]
-
-    neutron_network { $public_network_name:
-      ensure          => present,
-      router_external => true,
-      tenant_name     => $admin_tenant_name,
-    }
-
-    neutron_subnet { $public_subnet_name:
-      ensure       => 'present',
-      cidr         => $floating_range,
-      enable_dhcp  => false,
-      network_name => $public_network_name,
-      tenant_name  => $admin_tenant_name,
-    }
-
-    neutron_network { $private_network_name:
-      ensure      => present,
-      tenant_name => $tenant_name,
-    }
-
-    neutron_subnet { $private_subnet_name:
-      ensure       => present,
-      cidr         => $fixed_range,
-      network_name => $private_network_name,
-      tenant_name  => $tenant_name,
-    }
-
-    # Tenant-owned router - assumes network namespace isolation
-    neutron_router { $router_name:
-      ensure               => present,
-      tenant_name          => $tenant_name,
-      gateway_network_name => $public_network_name,
-      # A neutron_router resource must explicitly declare a dependency on
-      # the first subnet of the gateway network.
-      require              => Neutron_subnet[$public_subnet_name],
-    }
-
-    neutron_router_interface { "${router_name}:${private_subnet_name}":
-      ensure => present,
-    }
-  }
-
   ## Tempest
 
   if $configure_tempest {
-    $tempest_requires = concat([Keystone_user[$username]], $neutron_deps)
-
     class { '::tempest':
       tempest_repo_uri          => $tempest_repo_uri,
       tempest_clone_path        => $tempest_clone_path,