launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #11033
[Merge] lp:~jtv/maas/decobblerate-docs into lp:maas
Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/decobblerate-docs into lp:maas.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~jtv/maas/decobblerate-docs/+merge/119904
I left the documentation mentioning dnsmasq instead of sci-dhcp-server, but there's a bug open for fixing that: bug 1025844.
The old Cobbler preseeds are also gone; we now seem to use those from contrib/preseeds_v2 which I did not rename at the same time, because it might lead to confusion between old and new. Other branches may need updating first.
And then there's a snippet that could only have worked with Cobbler. Removing it may break things, but if so, those things should have been moved over to Cobbler so the more noticeable the failure, the better. However I couldn't find any mention in the maas trunk branch or in the related branches.
Jeroen
--
https://code.launchpad.net/~jtv/maas/decobblerate-docs/+merge/119904
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/decobblerate-docs into lp:maas.
=== modified file 'HACKING.txt'
--- HACKING.txt 2012-08-16 08:24:49 +0000
+++ HACKING.txt 2012-08-16 12:03:22 +0000
@@ -174,12 +174,9 @@
$ make sampledata
-Install Cobbler (via the maas-provision package), and install the preseed
-files and snippets::
+Install the provisioning server::
- $ sudo apt-get install apache2 maas-provision
- $ sudo cp contrib/preseeds/* /var/lib/cobbler/kickstarts/
- $ sudo cp contrib/snippets/* /var/lib/cobbler/snippets/
+ $ sudo apt-get install maas-provision
By default, the snippet ``maas_proxy`` includes a definition for an http
proxy running on port 8000 on the same host as the MAAS server. This
@@ -208,11 +205,6 @@
Or if you don't have it set but do want to download through a proxy, pass
your proxy's URL: "http_proxy=http://proxy.example.com/";
-Now add yourself as a user in Cobbler. For convenience, give yourself the
-password ``test``::
-
- $ sudo htdigest /etc/cobbler/users.digest Cobbler $USER
-
Run the development webserver and watch all the logs go by::
$ make run
=== modified file 'INSTALL.txt'
--- INSTALL.txt 2012-07-16 07:12:24 +0000
+++ INSTALL.txt 2012-08-16 12:03:22 +0000
@@ -53,10 +53,7 @@
$ sudo apt-get install dnsmasq
-MAAS enlists nodes using a tool called Cobbler. Cobbler provides a
-configuration file for dnsmasq: ``/etc/cobbler/dnsmasq.template``.
-
-Make the following changes:
+Make the following configuration changes:
``domain``
If applicable, specify your network's domain.
@@ -68,17 +65,6 @@
``dhcp-option=3,next_server``
Replace ``next_server`` with the current server's IP address.
-Save that file and now edit the Cobbler settings file:
-``/etc/cobbler/settings``.
-
-You need to change two settings:
-
-``manage_dns``
- Change the 0 to 1
-
-``manage_dhcp``
- Again, change the 0 to 1.
-
Now restart dnsmasq::
$ sudo /etc/init.d/dnsmasq restart
=== removed directory 'contrib/preseeds'
=== removed file 'contrib/preseeds/maas-commissioning.preseed'
--- contrib/preseeds/maas-commissioning.preseed 2012-04-10 04:30:25 +0000
+++ contrib/preseeds/maas-commissioning.preseed 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-$SNIPPET('maas_preseed')
=== removed file 'contrib/preseeds/maas-enlist.preseed'
--- contrib/preseeds/maas-enlist.preseed 2012-08-02 21:01:29 +0000
+++ contrib/preseeds/maas-enlist.preseed 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#cloud-config
-datasource:
- MAAS:
- timeout : 50
- max_wait : 120
- # there are no default values for metadata_url or oauth credentials
- # If no credentials are present, non-authed attempts will be made.
- metadata_url: http://@@server@@/MAAS/metadata/enlist
-
-output: {all: '| tee -a /var/log/cloud-init-output.log'}
=== removed file 'contrib/preseeds/maas.preseed'
--- contrib/preseeds/maas.preseed 2012-08-03 16:33:05 +0000
+++ contrib/preseeds/maas.preseed 1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-# MAAS - Ubuntu Server Installation
-# * Minimal install
-# * Cloud-init for bare-metal
-# * maas_preseed snippet is expanded to provide cloud-init preseed data
-
-# Locale
-d-i debian-installer/locale string en_US.UTF-8
-
-# No splash
-d-i debian-installer/splash boolean false
-
-# Keyboard layout
-d-i console-setup/ask_detect boolean false
-d-i console-setup/layoutcode string us
-d-i console-setup/variantcode string
-
-# Network configuration
-d-i netcfg/get_nameservers string
-d-i netcfg/get_ipaddress string
-d-i netcfg/get_netmask string 255.255.255.0
-d-i netcfg/get_gateway string
-d-i netcfg/confirm_static boolean true
-
-# Local clock (set to UTC and use ntp)
-d-i clock-setup/utc boolean true
-d-i clock-setup/ntp boolean true
-d-i clock-setup/ntp-server string ntp.ubuntu.com
-
-# Partitioning
-d-i partman/early_command string debconf-set partman-auto/disk `list-devices disk | head -n1`
-d-i partman-iscsi/mainmenu string finish
-d-i partman-auto/method string regular
-d-i partman-lvm/device_remove_lvm boolean true
-d-i partman-lvm/confirm boolean true
-d-i partman/confirm_write_new_label boolean true
-d-i partman/choose_partition select Finish partitioning and write changes to disk
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-d-i partman/default_filesystem string ext4
-
-# Use server kernel
-d-i base-installer/kernel/image string linux-server
-
-# User Setup
-d-i passwd/root-login boolean false
-d-i passwd/make-user boolean true
-d-i passwd/user-fullname string ubuntu
-d-i passwd/username string ubuntu
-d-i passwd/user-password-crypted password !
-d-i passwd/user-uid string
-d-i user-setup/allow-password-weak boolean false
-d-i user-setup/encrypt-home boolean false
-d-i passwd/user-default-groups string adm cdrom dialout lpadmin plugdev sambashare
-
-# APT
-$SNIPPET('maas_proxy')
-
-# By default the installer requires that repositories be authenticated
-# using a known gpg key. This setting can be used to disable that
-# authentication. Warning: Insecure, not recommended.
-d-i debian-installer/allow_unauthenticated string false
-
-# Lang
-d-i pkgsel/language-packs multiselect en
-d-i pkgsel/update-policy select none
-d-i pkgsel/updatedb boolean true
-
-# Boot-loader
-d-i grub-installer/skip boolean false
-d-i lilo-installer/skip boolean false
-d-i grub-installer/only_debian boolean true
-d-i grub-installer/with_other_os boolean true
-d-i finish-install/keep-consoles boolean false
-d-i finish-install/reboot_in_progress note
-
-# Eject cdrom
-d-i cdrom-detect/eject boolean true
-
-# Do not halt/poweroff after install
-d-i debian-installer/exit/halt boolean false
-d-i debian-installer/exit/poweroff boolean false
-
-# maas client packages
-$SNIPPET('maas_client_packages')
-
-# maas_preseed
-$SNIPPET('maas_preseed')
-
-# Post scripts. Executes late command and disables PXE
-d-i preseed/late_command string true && \
- $SNIPPET('maas_sudoers') && \
- $SNIPPET('maas_disable_pxe') && \
- true
=== removed file 'contrib/snippets/maas_disable_pxe'
--- contrib/snippets/maas_disable_pxe 2012-03-16 15:35:38 +0000
+++ contrib/snippets/maas_disable_pxe 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-wget "http://$http_server:$http_port/cblr/svc/op/nopxe/system/$system_name"; -O /dev/null \
=== modified file 'docs/juju-quick-start.rst'
--- docs/juju-quick-start.rst 2012-04-03 19:36:48 +0000
+++ docs/juju-quick-start.rst 2012-08-16 12:03:22 +0000
@@ -125,9 +125,9 @@
..
- ``zimmer`` is the machine on which Cobbler [#whatiscobbler]_ is
- running. Here ``odev-node02`` is the machine being bootstrapped as
- the Juju master node.
+ ``zimmer`` is the machine on which the MAAS server is running. Here
+ ``odev-node02`` is the machine being bootstrapped as the Juju master
+ node.
Once the master node has been installed a status command should come
up with something a bit more interesting::
@@ -158,9 +158,3 @@
sorrows in liquor, or, my preference, have another cup of tea.
----
-
-.. [#whatiscobbler] `Cobbler <http://cobbler.github.com/>`_ is a
- back-end service used by MAAS; ``vdenv`` provides a Cobbler server
- host - ``zimmer`` - and three nodes - ``odev-node0{1,2,3}`` - in
- virtual machines to aid development of MAAS. Cobbler is generally
- uninteresting for a user of MAAS.
