launchpad-reviewers team mailing list archive

[Scott Moser <smoser@xxxxxxxxxx>]

Scott Moser has proposed merging lp:~smoser/maas/vdenv-no-orchestra into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~smoser/maas/vdenv-no-orchestra/+merge/98420

vdenv: changes for moving away from orchestra

Orchestra related changes here are:
 * remove ubuntu-orchestra-* preseeds
 * update maas_proxy snippet rather than orchestra_proxy
 * use maas_import_isos rather than orchestra-import-isos

Other changes:
 * set cloud-init to use NoCloud datasource only. the OVF one is
   completely superceeded in usefulness and ease of use by NoCloud.
 * import both i386 and amd64 isos rather than just same arch as the server.
 * split out package install list into single lines for easier commenting

-- 
https://code.launchpad.net/~smoser/maas/vdenv-no-orchestra/+merge/98420
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~smoser/maas/vdenv-no-orchestra into lp:maas.

=== modified file 'vdenv/setup.py'
--- vdenv/setup.py	2012-03-12 16:40:38 +0000
+++ vdenv/setup.py	2012-03-20 14:31:19 +0000
@@ -160,7 +160,6 @@
         'profile': profile,
         'netboot_enabled': True,
         'modify_interface': eth0,
-        'mgmt_classes': ['orchestra-juju-available'],
     }
 
     if len(server.find_system({"name": system.name})):
@@ -194,7 +193,7 @@
 def cobbler_setup(config):
     hostip = "%s.1" % config['network']['ip_pre']
     arch = get_profile_arch()
-    profile = "precise-%s-juju" % arch
+    profile = "maas-precise-%s" % arch
     
     cob = System(config, "zimmer")
     cobbler_url = "http://%s/cobbler_api"; % cob.ipaddr

=== modified file 'vdenv/zimmer-build/ud-build.txt'
--- vdenv/zimmer-build/ud-build.txt	2012-03-14 16:26:52 +0000
+++ vdenv/zimmer-build/ud-build.txt	2012-03-20 14:31:19 +0000
@@ -16,13 +16,9 @@
 
    echo === $(date) ====
    debconf-set-selections <<EOF
-   ubuntu-orchestra-provisioning-server   ubuntu-orchestra-provisioning-server/import-isos   boolean  false
-   ubuntu-orchestra-provisioning-server   ubuntu-orchestra-provisioning-server/dnsmasq-dhcp-range  string   10.10.10.2,10.10.10.254
-   ubuntu-orchestra-provisioning-server   ubuntu-orchestra-provisioning-server/dnsmasq-enabled  boolean  false
    cobbler  cobbler/server_and_next_server   string   zimmer-server
    cobbler  cobbler/password  password xcobbler
-   cloud-init	cloud-init/datasources	multiselect	NoCloud, OVF
-
+   cloud-init	cloud-init/datasources	multiselect	NoCloud
    EOF
 
    [ -n "$ONE_TIME_PROXY" ] && export http_proxy="$ONE_TIME_PROXY"
@@ -36,38 +32,39 @@
 
    echo "127.0.1.2 zimmer-server" >> /etc/hosts
    
+   echo === $(date): starting apt ====
+   apt_get() { 
+     DEBIAN_FRONTEND=noninteractive apt-get \
+        --option "Dpkg::Options::=--force-confold" --assume-yes "$@"
+   }
+   pkgs=""
+   pkgs="$pkgs distro-info" # (LP: #960142)
+   pkgs="$pkgs libvirt-bin" # for power control via virsh
+   pkgs="$pkgs cobbler-web" # for debugging and ease of use of cobbler
+   pkgs="$pkgs ubuntu-orchestra-logging-server" # (LP: #960149)
+   pkgs="$pkgs maas" # main maas package
+   apt_get update
+   apt_get install ${pkgs}
+   
    # if local apt is configured to use a proxy, modify
    # cobbler to tell nodes to use that proxy. (LP: #914202)
    if [ "${PROXY_COPY_SYS_TO_COBBLER:-1}" != "0" ] &&
       apt_proxy="" && out=$(apt-config shell apt_proxy Acquire::HTTP::Proxy) &&
       eval $out && [ -n "$apt_proxy" ]; then
-      fname=/var/lib/cobbler/snippets/orchestra_proxy
+      fname=/var/lib/cobbler/snippets/maas_proxy
       [ "${fname}.dist" -ef "$fname" ] || cp "$fname" "$fname.dist"
       sed "s,\(.*mirror/http/proxy string \).*,\1${apt_proxy}," \
          "$fname" > "$fname.zimmer"
       ln -sf ${fname##*/}.zimmer "$fname"
    fi
 
-   echo === $(date): starting apt ====
-   apt_get() { 
-     DEBIAN_FRONTEND=noninteractive apt-get \
-        --option "Dpkg::Options::=--force-confold" --assume-yes "$@"
-   }
-   apt_get update
-   apt_get install ubuntu-orchestra-provisioning-server libvirt-bin \
-      cobbler-web ubuntu-orchestra-logging-server
-   
-   case $(uname -m) in
-      i?86) arches="i386";;
-      *) arches="amd64";;
-   esac
-   cat >> /etc/orchestra/import_isos <<END
-   RELEASES="oneiric precise"
-   ARCHES="${arches}"
+   cat >> /etc/maas/import_isos <<END
+   RELEASES="precise"
+   ARCHES="i386 amd64"
    END
 
    echo === $(date): starting import ====
-   orchestra-import-isos
+   maas-import-isos
 
    sed -i '/zimmer-server/d' /etc/hosts