← Back to branch summary

~ubuntu-branches/ubuntu/lucid/eucalyptus/lucid-updates

« back to all changes in this revision

Viewing changes to tools/euca_upgrade

  • Committer: Bazaar Package Importer
  • Author(s): Dustin Kirkland, Dustin Kirkland, Scott Moser
  • Date: 2010-03-22 17:22:48 UTC
  • Revision ID: james.westby@ubuntu.com-20100322172248-necpo3nto3114zrw
Tags: 1.6.2-0ubuntu20
https://launchpad.net/bugs/519513
https://launchpad.net/bugs/544292
https://launchpad.net/bugs/520775
[ Dustin Kirkland ]
* Continue fixing karmic -> lucid upgrades, LP: #519513
* debian/eucalyptus-java-common.postinst: ensure that the db dir exists
  before running euca_upgrade
* debian/eucalyptus-common.preinst: ensure that the local conf exists
* tools/euca_upgrade:
  - on upgrade, migrate eucalyptus.conf settings to eucalyptus.local.conf
  - on upgrade, migrated $NODES to nodes.list
* clc/modules/msgs/conf/scripts/startup.groovy: change m1.small to 192M
  such that we can actually boot the lucid uec image, LP: #544292

[ Scott Moser ]
* debian/source_eucalyptus.py: fix AttributeError, LP: #520775

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/euca_upgrade
223
223
        
224
224
    # upgrade the conf file
225
225
        export EUCALYPTUS="$NEW_EUCA"
226
 
        $EUCALYPTUS/usr/sbin/euca_conf -d $EUCALYPTUS --upgrade-conf $OLD_EUCA/etc/eucalyptus/eucalyptus.conf $EUCALYPTUS/etc/eucalyptus/eucalyptus.conf 
 
226
        $EUCALYPTUS/usr/sbin/euca_conf -d $EUCALYPTUS --upgrade-conf $OLD_EUCA/etc/eucalyptus/eucalyptus.conf $EUCALYPTUS/etc/eucalyptus/eucalyptus.local.conf
 
227
        # Populate nodes.list
 
228
        . $EUCALYPTUS/etc/eucalyptus/eucalyptus.local.conf
 
229
        if [ -n "$NODES" ]; then
 
230
                for i in $NODES; do
 
231
                        echo "$i" >> $EUCALYPTUS/var/lib/eucalyptus/nodes.list
 
232
                done
 
233
        fi
 
234
        sed -i "s/^NODES=/#NODES=/" $EUCALYPTUS/etc/eucalyptus/eucalyptus.local.conf
 
235
        chmod 644 $EUCALYPTUS/etc/eucalyptus/eucalyptus.local.conf
 
236
        chown eucalyptus:root $EUCALYPTUS/etc/eucalyptus/eucalyptus.local.conf
227
237
    fi
228
238
    echo "Done."
229
239
fi