openstack/charm-swift-storage
Code Issues Proposed changes

Remove duplicate hook.

Browse Source
This commit is contained in:
Adam Gandelman 2013-05-22 13:57:34 -07:00
parent 610f6ae653
commit d903906523
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hooks/swift-storage-node-relations
View File

@ -12,7 +12,17 @@ else
fi fi
function config_changed { function config_changed {
# perform openstack upgrade if openstack-origin has been bumped.
local install_src=$(config-get openstack-origin)
local cur=$(get_os_codename_package "glance-common")
local available=$(get_os_codename_install_source "$install_src")
if [[ "$available" != "unknown" ]] ; then
if dpkg --compare-versions $(get_os_version_codename "$cur") lt \
$(get_os_version_codename "$available") ; then
juju-log "$CHARM: Upgrading OpenStack release: $cur -> $available."
do_openstack_upgrade "$install_src" $PACKAGES
fi
fi
declare -a env_vars=() declare -a env_vars=()
for i in account container object ; do for i in account container object ; do
port=$(config-get ${i}-server-port) port=$(config-get ${i}-server-port)
@ -29,7 +39,7 @@ function config_changed {
# Save our scriptrc env variables for health checks # Save our scriptrc env variables for health checks
save_script_rc ${env_vars[@]} save_script_rc ${env_vars[@]}
} }
function install_hook { function install_hook {
apt-get -y --force-yes install python-software-properties || exit 1 apt-get -y --force-yes install python-software-properties || exit 1
@ -83,19 +93,6 @@ function storage_changed {
swift-init all start || true swift-init all start || true
} }
function config_changed {
local install_src=$(config-get openstack-origin)
local cur=$(get_os_codename_package "glance-common")
local available=$(get_os_codename_install_source "$install_src")
if [[ "$available" != "unknown" ]] ; then
if dpkg --compare-versions $(get_os_version_codename "$cur") lt \
$(get_os_version_codename "$available") ; then
juju-log "$CHARM: Upgrading OpenStack release: $cur -> $available."
do_openstack_upgrade "$install_src" $PACKAGES
fi
fi
}
case $ARG0 in case $ARG0 in
"install") install_hook ;; "install") install_hook ;;
"start"|"stop") exit 0 ;; "start"|"stop") exit 0 ;;

2
revision
View File

@ -1 +1 @@
58 59