openstack
/
devstack-vagrant
Code Issues Proposed changes

Add extra-images puppet variable 

If the user wants to use his own mirror to get extra images for glance
or wants to add more images not just the default cirros it can be done
using this custom variable on config.yaml

Change-Id: I121ba07f15427b926ddade36adfc60a89647a9d4
This commit is contained in:
Geronimo Orozco 2015-01-06 23:40:08 -06:00
parent c94d2b3479
commit 64ef7d6e38
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Vagrantfile vendored
View File

@ -54,6 +54,7 @@ def configure_vm(name, vm, conf)
"is_vagrant" => true,
"is_compute" => (name != "manager"),
"use_ldap" => conf["use_ldap"] || false,
"extra_images" => conf["extra_images"] || "",
}
# add all the rest of the content in the conf file
conf.each do |k, v|

4
config.yaml.sample
View File

@ -59,3 +59,7 @@ bridge_int: eth1
# will be used.
#ip_address_manager: 10.0.10.10
#ip_address_compute: 10.0.10.20
# Extra images to download and add to glance, a list of url's comma separated
# for new images to be added to glance
#extra_images: https://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img,https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img

3
puppet/modules/devstack/templates/local.erb
View File

@ -45,8 +45,7 @@ enable_service ceilometer-acompute
# configure images provided on glance (manager)
IMAGE_URLS="http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-uec.tar.gz"
IMAGE_URLS+=",https://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img"
IMAGE_URLS+=",https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img"
IMAGE_URLS+=",<%= @extra_images %>"
# configure ceilometer (manager)