openstack/charm-nova-compute-proxy
Code Issues Proposed changes

fix add_ppa to pull version from config-get

Browse Source
This commit is contained in:
Adam Gandelman 2011-08-10 06:44:57 -07:00
parent cef002fd5f
commit f5a664ca03
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hooks/nova-compute-common
View File

@ -1,17 +1,16 @@
#!/bin/bash #!/bin/bash
SERVICES="nova-compute" SERVICES="nova-compute"
NOVA_CONF="/etc/nova/nova.conf" NOVA_RELEASE=$(config-get nova-release)
NOVA_CONF=$(config-get nova-config)
RABBIT_USER="nova-compute" RABBIT_USER=$(config-get rabbit-user)
RABBIT_VHOST="nova" RABBIT_VHOST=$(config-get rabbit-vhost)
DB_USER=$(config-get db-user)
DB_USER="nova" NOVA_DB=$(config-get nova-db)
NOVA_DB="nova" NETWORK_MANAGER=$(config-get network-manager)
NETWORK_BRIDGE=$(config-get bridge-interface)
NETWORK_MANAGER="FlatManager" BRIDGE_IP=$(config-get bridge-ip)
NETWORK_BRIDGE="br100" BRIDGE_NETMASK=$(config-get bridge-netmask)
BRIDGE_IP="11.0.0.2" PPA=$(config-get nova-release)
HOSTNAME=`hostname -f` HOSTNAME=`hostname -f`
function set_or_update { function set_or_update {
@ -107,15 +106,11 @@ function configure_network_manager {
} }
function add_ppa { function add_ppa {
# temporarily find out what nova version we # don't setup PPA, install from archive
# should be using from a source file. this [[ $PPA == "distro" ]] && return 0
# should go away when ensemble can handle config ensemble-log "nova-cloud-controller: Configuring PPA access for $PPA"
# better. . /etc/lsb-release
if [[ -e $FORMULA_DIR/nova-version ]] ; then PPA_URL="deb http://ppa.launchpad.net/nova-core/$PPA/ubuntu $DISTRIB_CODENAME main"
. $FORMULA_DIR/nova-version echo "Executing: add-apt-repository \"$PPA_URL\"" || exit 1
. /etc/lsb-release add-apt-repository "$PPA_URL" || exit 1
[[ -z $PPA ]] && return 0
PPA_URL="deb http://ppa.launchpad.net/nova-core/$PPA/ubuntu $DISTRIB_CODENAME main"
add-apt-repository "$PPA_URL" || exit 1
fi
} }

2
metadata.yaml
View File

@ -1,6 +1,6 @@
ensemble: formula ensemble: formula
name: nova-compute name: nova-compute
revision: 17 revision: 28
summary: "OpenStack compute" summary: "OpenStack compute"
description: | description: |
OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In