openstack
/
devstack-vagrant
Code Issues Proposed changes

Merge "Add extra-images puppet variable"

This commit is contained in:
Jenkins 2015-02-18 15:38:42 +00:00 committed by Gerrit Code Review
parent d65fe587e3 64ef7d6e38
commit 1782ba1a5b
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

@ -68,6 +68,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

@ -62,3 +62,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)