allow provision demo image to be user-selected

This replaces CONFIG_PROVISION_CIRROS_URL with a set of configuration
options that permit a deployer to specify the image url, image name, and
username to use when connecting:

  CONFIG_PROVISION_IMAGE_URL
  CONFIG_PROVISION_IMAGE_NAME
  CONFIG_PROVISION_IMAGE_FORMAT
  CONFIG_PROVISION_IMAGE_SSH_USER

Resolves: rhbz#982035
Change-Id: Id6db5ea551465a6dbf94890e2fc895d255c5bd8e
This commit is contained in:
Lars Kellogg-Stedman
2015-03-18 13:34:04 -04:00
committed by Javier Pena
parent 8157722953
commit f7dfb9755f
5 changed files with 77 additions and 21 deletions

View File

@@ -20,9 +20,10 @@ if $provision_tempest_user != '' {
$admin_tenant_name = 'admin'
## Glance
$image_name = 'cirros'
$image_source = hiera('CONFIG_PROVISION_CIRROS_URL')
$image_ssh_user = 'cirros'
$image_name = hiera('CONFIG_PROVISION_IMAGE_NAME')
$image_source = hiera('CONFIG_PROVISION_IMAGE_URL')
$image_ssh_user = hiera('CONFIG_PROVISION_IMAGE_SSH_USER')
$image_format = hiera('CONFIG_PROVISION_IMAGE_FORMAT')
## Neutron
$public_network_name = 'public'