x/anvil
Code Issues Proposed changes

updated to sync again with devstack v1, fixes issue #75, for now

Browse Source
This commit is contained in:
Joshua Harlow 2012-03-12 12:56:59 -07:00
parent bd092dcbbf
commit f7deb187e3
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/pips/horizon.json
View File

@ -7,6 +7,9 @@
}, },
"pycrypto": { "pycrypto": {
"version": "2.3" "version": "2.3"
},
"python-cloudfiles": {
"version": "1.7.9.3"
} }
}, },
"rhel-6": { "rhel-6": {

4
conf/pkgs/horizon.json
View File

@ -84,10 +84,6 @@
"version": "0.7*", "version": "0.7*",
"removable": true "removable": true
}, },
"python-cloudfiles": {
"version": "1.7.9*",
"removable": true
},
"python-migrate": { "python-migrate": {
"version": "0.7*", "version": "0.7*",
"removable": true "removable": true

2
conf/stack.ini
View File

@ -246,7 +246,7 @@ m_port = ${M_PORT:-9898}
m_host = ${M_HOST:-$(host:ip)} m_host = ${M_HOST:-$(host:ip)}
# Melange MAC Address Range # Melange MAC Address Range
m_mac_range = ${M_MAC_RANGE:-404040/24} m_mac_range = ${M_MAC_RANGE:-FE-EE-DD-00-00-00/24}
[quantum] [quantum]

6
conf/templates/keystone/default_catalog.templates
View File

@ -26,6 +26,12 @@ catalog.RegionOne.ec2.internalURL = http://%SERVICE_HOST%:8773/services/Cloud
catalog.RegionOne.ec2.name = 'EC2 Service' catalog.RegionOne.ec2.name = 'EC2 Service'
catalog.RegionOne.s3.publicURL = http://%SERVICE_HOST%:3333
catalog.RegionOne.s3.adminURL = http://%SERVICE_HOST%:3333
catalog.RegionOne.s3.internalURL = http://%SERVICE_HOST%:3333
catalog.RegionOne.s3.name = 'S3 Service'
catalog.RegionOne.image.publicURL = http://%SERVICE_HOST%:9292/v1 catalog.RegionOne.image.publicURL = http://%SERVICE_HOST%:9292/v1
catalog.RegionOne.image.adminURL = http://%SERVICE_HOST%:9292/v1 catalog.RegionOne.image.adminURL = http://%SERVICE_HOST%:9292/v1
catalog.RegionOne.image.internalURL = http://%SERVICE_HOST%:9292/v1 catalog.RegionOne.image.internalURL = http://%SERVICE_HOST%:9292/v1

3
devstack/libvirt.py
View File

@ -32,8 +32,7 @@ LIBVIRT_PROTOCOL_MAP = {
'uml': 'uml:///system', 'uml': 'uml:///system',
'lxc': 'lxc:///', 'lxc': 'lxc:///',
} }
VIRT_TYPE = 'libvirt' VIRT_LIB = 'libvirt'
VIRT_LIB = VIRT_TYPE
#distros name the libvirt service differently :-( #distros name the libvirt service differently :-(
SV_NAME_MAP = { SV_NAME_MAP = {