openstack
/
openstack-chef-repo
Code Issues Proposed changes

Merge "Use default cirros image defined in cookbook"

This commit is contained in:
Jenkins 2016-04-11 00:43:07 +00:00 committed by Gerrit Code Review
parent 6968db44a9 07193a0c25
commit c0cca20fea
4 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
environments/allinone-centos7.json
View File

@ -22,13 +22,7 @@
}
},
"image": {
"image_upload": true,
"upload_images": [
"cirros"
],
"upload_image": {
"cirros": "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
}
"image_upload": true
},
"compute": {
"conf": {

8
environments/allinone-ubuntu14.json
View File

@ -29,13 +29,7 @@
}
},
"image": {
"image_upload": true,
"upload_images": [
"cirros"
],
"upload_image": {
"cirros": "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
}
"image_upload": true
},
"compute": {
"conf": {

8
environments/vagrant-multi-centos7-neutron.json
View File

@ -40,13 +40,7 @@
}
},
"image": {
"image_upload": true,
"upload_images": [
"cirros"
],
"upload_image": {
"cirros": "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
}
"image_upload": true
},
"compute": {
"novnc_proxy": {

8
environments/vagrant-multi-neutron.json
View File

@ -77,13 +77,7 @@
"registry": {
"bind_interface": "eth1"
},
"image_upload": true,
"upload_images": [
"cirros"
],
"upload_image": {
"cirros": "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
}
"image_upload": true
},
"compute": {
"enabled_apis": "ec2,osapi_compute",