diff -Nru orchestra-2.27/ChangeLog orchestra-2.28/ChangeLog --- orchestra-2.27/ChangeLog 2012-01-04 19:42:28.000000000 +0000 +++ orchestra-2.28/ChangeLog 2012-02-10 18:34:41.000000000 +0000 @@ -1,10 +1,25 @@ -orchestra (2.27) released; urgency=low +orchestra (2.28) released; urgency=low + + [ Marc Cluet ] + * debian/control: + - Remove monitoring package + - Remove explicit byobu declaration + + [ Andres Rodriguez ] + * Create 'default' system for enlistment (LP: #898840) + * Do not deny apt Packages. Thanks to Scott Moser (LP: #927750) + * debian/ubuntu-orchestra-provisioning-server.postrm: Remove not only on + 'purge' but in 'remove' to not break apache. (LP: #929368) + + -- Andres Rodriguez Fri, 10 Feb 2012 11:37:00 -0500 + +orchestra (2.27-0ubuntu1) precise; urgency=low * Update orchestra_client_package snippet (LP: #903826) * debian/ubuntu-orchestra-provisioning-server.postinst: Allow dpkg to exit even if orchestra-import-isos is still running. - -- Andres Rodriguez Tue, 03 Jan 2012 17:31:49 -0500 + -- Andres Rodriguez Wed, 04 Jan 2012 14:44:39 -0500 orchestra (2.26-0ubuntu1) precise; urgency=low diff -Nru orchestra-2.27/debian/changelog orchestra-2.28/debian/changelog --- orchestra-2.27/debian/changelog 2012-02-10 18:48:42.000000000 +0000 +++ orchestra-2.28/debian/changelog 2012-02-10 18:48:42.000000000 +0000 @@ -1,10 +1,25 @@ +orchestra (2.28-0ubuntu1) precise; urgency=low + + [ Marc Cluet ] + * debian/control: + - Remove monitoring package + - Remove explicit byobu declaration + + [ Andres Rodriguez ] + * Create 'default' system for enlistment (LP: #898840) + * Do not deny apt Packages. Thanks to Scott Moser (LP: #927750) + * debian/ubuntu-orchestra-provisioning-server.postrm: Remove not only on + 'purge' but in 'remove' to not break apache. (LP: #929368) + + -- Andres Rodriguez Fri, 10 Feb 2012 11:37:00 -0500 + orchestra (2.27-0ubuntu1) precise; urgency=low * Update orchestra_client_package snippet (LP: #903826) * debian/ubuntu-orchestra-provisioning-server.postinst: Allow dpkg to exit even if orchestra-import-isos is still running. - -- Andres Rodriguez Tue, 03 Jan 2012 17:31:49 -0500 + -- Andres Rodriguez Wed, 04 Jan 2012 14:44:39 -0500 orchestra (2.26-0ubuntu1) precise; urgency=low diff -Nru orchestra-2.27/debian/control orchestra-2.28/debian/control --- orchestra-2.27/debian/control 2012-02-10 18:48:42.000000000 +0000 +++ orchestra-2.28/debian/control 2012-02-10 18:48:42.000000000 +0000 @@ -41,7 +41,6 @@ Recommends: ubuntu-orchestra-provisioning-server, ubuntu-orchestra-management-server, - ubuntu-orchestra-monitoring-server, ubuntu-orchestra-logging-server Description: Ubuntu Orchestra Services suite This virtual package installs the dependencies necessary to provision, @@ -66,9 +65,7 @@ openssh-server, ubuntu-orchestra-common Recommends: - byobu, etckeeper, - nagios-nrpe-server, powernap, rsyslog, rsyslog-gnutls, @@ -95,20 +92,6 @@ It also includes some configuration necessary to make this work well out of the box. -Package: ubuntu-orchestra-monitoring-server -Architecture: all -Depends: ${misc:Depends}, - nagios3-core, - nagios3-cgi, - ubuntu-orchestra-common -Recommends: nagios-nrpe-server -Description: Ubuntu Orchestra Monitoring Server - This virtual package installs the dependencies necessary to monitor an - Ubuntu data center. - . - It also includes some configuration necessary to make this work well - out of the box. - Package: ubuntu-orchestra-provisioning-server Architecture: all Depends: ${misc:Depends}, ${python:Depends}, diff -Nru orchestra-2.27/debian/ubuntu-orchestra-provisioning-server.postrm orchestra-2.28/debian/ubuntu-orchestra-provisioning-server.postrm --- orchestra-2.27/debian/ubuntu-orchestra-provisioning-server.postrm 2012-02-10 18:48:42.000000000 +0000 +++ orchestra-2.28/debian/ubuntu-orchestra-provisioning-server.postrm 2012-02-10 18:48:42.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh -e -if [ "$1" = "purge" ] ; then +if [ "$1" = "remove" ] || [ "$1" = "purge" ] ; then # Remove juju storage configuration rm -f /etc/apache2/conf.d/juju_webdav.conf diff -Nru orchestra-2.27/monitoring-server/etc/cron.d/orchestra-nagios-generate orchestra-2.28/monitoring-server/etc/cron.d/orchestra-nagios-generate --- orchestra-2.27/monitoring-server/etc/cron.d/orchestra-nagios-generate 2012-01-04 19:42:13.000000000 +0000 +++ orchestra-2.28/monitoring-server/etc/cron.d/orchestra-nagios-generate 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# Runs orchestra-import-isos every Sunday at 4am -# This will get the new mini.iso and generate a new cobbler profile -*/5 * * * * root /usr/sbin/orchestra-generate-nagios-hosts &> /dev/null diff -Nru orchestra-2.27/monitoring-server/usr/sbin/orchestra-generate-nagios-hosts orchestra-2.28/monitoring-server/usr/sbin/orchestra-generate-nagios-hosts --- orchestra-2.27/monitoring-server/usr/sbin/orchestra-generate-nagios-hosts 2012-01-04 19:42:13.000000000 +0000 +++ orchestra-2.28/monitoring-server/usr/sbin/orchestra-generate-nagios-hosts 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -#!/bin/sh -# -# orchestra-generate-nagios-hosts - Generate hosts for nagios -# -# Copyright (C) 2011 Canonical -# -# Author: -# Marc Cluet -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -#Variables -AUTOGROUPS="/etc/nagios3/conf.d/hostgroups.orchestra.conf" -AUTOHOSTS="/etc/nagios3/conf.d/hosts.orchestra.conf" - -ALLCOBBLERSYSTEMS=`cobbler system list | awk '{print $1}' | wc -l` - -if [ "$ALLCOBBLERSYSTEMS" = "0" ]; then exit 0; fi - -if [ -f "$AUTOGROUPS" ]; then mv -f ${AUTOGROUPS} ${AUTOGROUPS}.old; fi -if [ -f "$AUTOHOSTS" ]; then mv -f ${AUTOHOSTS} ${AUTOHOSTS}.old; fi - -# Preseeding -echo "# File generated by orchestra-generate-nagios-hosts" > $AUTOHOSTS -echo "# File generated by orchestra-generate-nagios-hosts" > $AUTOGROUPS -COBBLERHOSTS="" - -# Generate hosts -for cobblersystem in $(cobbler system list | awk '{print $1}') -do - echo "`date` -- Generating host $cobblersystem" - echo -e "" >> $AUTOHOSTS - echo -e "define host {" >> $AUTOHOSTS - echo -e "\thost_name\t${cobblersystem}" >> $AUTOHOSTS - echo -e "\talias\t${cobblersystem}" >> $AUTOHOSTS - echo -e "\taddress\t${cobblersystem}" >> $AUTOHOSTS - echo -e "\tuse\tgeneric-host" >> $AUTOHOSTS - echo -e "}" >> $AUTOHOSTS - COBBLERHOSTS="$COBBLERHOSTS $cobblersystem" -done - -echo "`date` -- Generating hostgroup for orchestra" -echo -e "" >> $AUTOGROUPS -echo -e "#Server group for orchestra" >> $AUTOGROUPS -echo -e "define hostgroup {" >> $AUTOGROUPS -echo -e "\thostgroup_name\torchestra" >> $AUTOGROUPS -echo -e "\talias\t\torchestra" >> $AUTOGROUPS -echo -e "\tmembers\t\t${COBBLERHOSTS}" >> $AUTOGROUPS -echo -e "}" >> $AUTOGROUPS - -# Send signal to nagios to reload the configuration -service nagios3 reload 1>/dev/null 2>&1 - diff -Nru orchestra-2.27/provisioning-server/usr/sbin/orchestra-import-isos orchestra-2.28/provisioning-server/usr/sbin/orchestra-import-isos --- orchestra-2.27/provisioning-server/usr/sbin/orchestra-import-isos 2012-01-04 19:42:13.000000000 +0000 +++ orchestra-2.28/provisioning-server/usr/sbin/orchestra-import-isos 2012-02-10 18:34:29.000000000 +0000 @@ -2,11 +2,12 @@ # # orchestra-import-isos - sync and import Ubuntu isos into cobbler # -# Copyright (C) 2011 Canonical +# Copyright (C) 2011-2012 Canonical # # Authors: # Marc Cluet # Dustin Kirkland +# Andres Rodriguez # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -37,6 +38,7 @@ [ -n "$MGMTCLASS_ACQUIRED" ] || MGMTCLASS_ACQUIRED="orchestra-juju-acquired" [ -n "$INTERFACE" ] || INTERFACE="auto" [ -n "$KOPTS" ] || KOPTS="priority=$PRIORITY locale=$LOCALE netcfg/choose_interface=$INTERFACE" +[ -n "$ENLIST_PROFILE" ] || ENLIST_PROFILE="ubuntu-enlist" if [ -n "$SERVER_IP" ]; then KOPTS="$KOPTS log_host=$SERVER_IP log_port=514" else @@ -92,6 +94,29 @@ done } +add_enlist_profile(){ + STABLE=$(distro-info --stable) + DEVEL=$(distro-info --devel) + PARENT_PROFILE="" + + # Check what release to use as parent profile + if [ `echo $STABLE "precise" | awk '{ print ($1 >= $2) ? "True" : "False" }'` = True ]; then + PARENT_PROFILE="$STABLE-i386" + else + PARENT_PROFILE="$DEVEL-i386" + fi + + # Add enlist profile + if cobbler profile list | grep -qs " $ENLIST_PROFILE"; then + cobbler profile edit --name="$ENLIST_PROFILE" --parent="$PARENT_PROFILE" + else + cobbler profile add --name="$ENLIST_PROFILE" --parent="$PARENT_PROFILE" --kickstart="$KSDIR/ubuntu-enlist.preseed" + fi + + # Add 'default' system if doesn't exist. + (cobbler system list | grep -qs " default") || cobbler system add --name="default" --profile="$ENLIST_PROFILE" +} + Usage() { cat <