MAAS

Merge lp:~andreserl/maas/quantal_packaging_updates into lp:~maas-maintainers/maas/packaging.quantal

  1. quantal_packaging_updates
  2. Merge into packaging.quantal
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 145
Proposed branch: lp:~andreserl/maas/quantal_packaging_updates
Merge into: lp:~maas-maintainers/maas/packaging.quantal
Diff against target: 157 lines (+31/-32)
7 files modified
debian/changelog (+4/-1)
debian/maas-cluster-controller.install (+11/-0)
debian/maas-cluster-controller.postinst (+11/-0)
debian/maas-cluster-controller.postrm (+5/-0)
debian/maas-region-controller.install (+0/-13)
debian/maas-region-controller.postinst (+0/-13)
debian/maas-region-controller.postrm (+0/-5)
To merge this branch: bzr merge lp:~andreserl/maas/quantal_packaging_updates
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Andres Rodriguez (community) Approve
Review via email: mp+135264@code.launchpad.net

Commit message

maas-cluster-controller installs tgtd and import scripts and related files.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

As far as I understand, now the Cluster Controller is the one in charge of downloading and storing the images, and it is celery that runs them. This fix has been backported to the 1.2 branch as part as the stabilization fixes.

For this reason, I have back ported this from the raring branch as it would continue to be required. This installs the necessary scripts as well as the tgtd stuff in the cluster-controller rather than in region-controller.

Please, verify this is the case.

Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve
Revision history for this message
Julian Edwards (julian-edwards) wrote :

I am also keeping the precise packaging changes in a branch here lp:~julian-edwards/maas/precise-backport

It will need the same change, so I'll take this diff and apply it to my branch when this one lands.

Revision history for this message
Julian Edwards (julian-edwards) wrote :

My bad - this is unnecessary as we have not backported the downloading via the clusters.

review: Disapprove
Revision history for this message
Julian Edwards (julian-edwards) wrote :

GRAR, let's get this straight - the sudoers change is not necessary, everything else is :)

review: Needs Information
Revision history for this message
Julian Edwards (julian-edwards) :
review: Needs Fixing
Revision history for this message
Andres Rodriguez (andreserl) wrote :

Fixed. Approving

Revision history for this message
MAAS Lander (maas-lander) wrote :

No commit message specified.

Revision history for this message
MAAS Lander (maas-lander) wrote :

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 1 Needs Fixing.

Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-19 19:05:03 +0000
3+++ debian/changelog 2012-11-21 01:21:20 +0000
4@@ -1,4 +1,4 @@
5-maas (0.1+bzr1307+dfsg-0ubuntu1) UNRELEASED; urgency=low
6+maas (0.1+bzr1309+dfsg-0ubuntu1) UNRELEASED; urgency=low
7
8 * New upstream bugfix release. Fixes:
9 - IPMI detection ends up with power_address of 0.0.0.0 (LP: #1064224)
10@@ -39,6 +39,9 @@
11 * debian/maas-cluster-controller.config: If URL has been detected, add /MAAS if
12 it doesn't contain it. This helps upgrades from versions where DEFAULT_MAAS_URL
13 didn't use /MAAS.
14+ * Install maas-import-pxe-files and related files with maas-cluster-controller,
15+ as well as configure tgtd, as maas-region-controller no longer stores images.
16+ Thanks to Jeroen Vermuelen.
17
18 [ Gavin Panella ]
19 * debian/extras/99-maas: squashfs image download is no longer needed.
20
21=== modified file 'debian/maas-cluster-controller.install'
22--- debian/maas-cluster-controller.install 2012-10-10 19:06:52 +0000
23+++ debian/maas-cluster-controller.install 2012-11-21 01:21:20 +0000
24@@ -13,6 +13,17 @@
25 # Install local celery cluster config file
26 debian/tmp/etc/maas/maas_local_celeryconfig_cluster.py
27
28+# Install maas-import-pxe-files
29+debian/tmp/usr/sbin/maas-import-pxe-files
30+etc/cron.d/maas-import-pxe-files
31+man/maas-import-pxe-files.8 usr/share/man/man8
32+debian/tmp/etc/maas/import_pxe_files
33+debian/tmp/usr/sbin/maas-import-ephemerals
34+debian/tmp/etc/maas/import_ephemerals
35+debian/tmp/etc/maas/commissioning-user-data
36+# Obsolete, but still available for compatibility:
37+scripts/maas-import-isos usr/sbin
38+
39 # Install all other stuff
40 debian/extras/99-maas-sudoers etc/sudoers.d
41 debian/extras/isc-dhcp-server.override etc/init
42
43=== modified file 'debian/maas-cluster-controller.postinst'
44--- debian/maas-cluster-controller.postinst 2012-10-11 18:16:28 +0000
45+++ debian/maas-cluster-controller.postinst 2012-11-21 01:21:20 +0000
46@@ -17,6 +17,15 @@
47 chmod -R 775 /var/log/maas/oops
48 }
49
50+configure_maas_tgt(){
51+ # Set up iSCSI: add maas.conf to tgt conf.d.
52+ local tgtcfg="/etc/tgt/targets.conf"
53+ [ -d /etc/tgt/conf.d/ ] ||
54+ echo "Warning! $tgtcfg did not exist" 1>&2;
55+ mkdir -p /etc/tgt/conf.d/ /var/lib/maas/ephemeral/
56+ ln -sf /var/lib/maas/ephemeral/tgt.conf /etc/tgt/conf.d/maas.conf
57+}
58+
59 if [ "$1" = "configure" ] && [ -z "$2" ]; then
60 # logging
61 create_log_dir
62@@ -32,6 +41,8 @@
63 sed -i "s|^CLUSTER_UUID\ \= None$|CLUSTER_UUID = '"$uuid"'|" \
64 /etc/maas/maas_local_celeryconfig_cluster.py
65 fi
66+
67+ configure_maas_tgt
68 fi
69
70 if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
71
72=== modified file 'debian/maas-cluster-controller.postrm'
73--- debian/maas-cluster-controller.postrm 2012-10-11 18:16:28 +0000
74+++ debian/maas-cluster-controller.postrm 2012-11-21 01:21:20 +0000
75@@ -18,6 +18,11 @@
76 rm -rf /var/lib/maas
77 fi
78
79+ # Delete symlink for iSCSI config.
80+ if [ -L /etc/tgt/conf.d/maas.conf ]; then
81+ rm -rf /etc/tgt/conf.d/maas.conf
82+ fi
83+
84 esac
85
86 #DEBHELPER#
87
88=== modified file 'debian/maas-region-controller.install'
89--- debian/maas-region-controller.install 2012-11-15 15:10:10 +0000
90+++ debian/maas-region-controller.install 2012-11-21 01:21:20 +0000
91@@ -22,19 +22,6 @@
92 # Install txlongpoll config file
93 debian/tmp/etc/maas/txlongpoll.yaml
94
95-# Install maas-import-pxe-files
96-debian/tmp/usr/sbin/maas-import-pxe-files
97-
98-# Install maas-import-pxe-files and related files
99-etc/cron.d/maas-import-pxe-files
100-man/maas-import-pxe-files.8 usr/share/man/man8
101-debian/tmp/etc/maas/import_pxe_files
102-debian/tmp/usr/sbin/maas-import-ephemerals
103-debian/tmp/etc/maas/import_ephemerals
104-debian/tmp/etc/maas/commissioning-user-data
105-# Obsolete, but still available for compatibility:
106-scripts/maas-import-isos usr/sbin
107-
108 # Install new preseed files
109 debian/tmp/usr/share/maas/preseeds
110
111
112=== modified file 'debian/maas-region-controller.postinst'
113--- debian/maas-region-controller.postinst 2012-10-16 14:30:48 +0000
114+++ debian/maas-region-controller.postinst 2012-11-21 01:21:20 +0000
115@@ -104,14 +104,6 @@
116 fi
117 }
118
119-configure_maas_tgt(){
120- local tgtcfg="/etc/tgt/targets.conf"
121- [ -d /etc/tgt/conf.d/ ] ||
122- echo "Warning! $tgtcfg did not exist" 1>&2;
123- mkdir -p /etc/tgt/conf.d/ /var/lib/maas/ephemeral/
124- ln -sf /var/lib/maas/ephemeral/tgt.conf /etc/tgt/conf.d/maas.conf
125-}
126-
127 configure_maas_default_url() {
128 local ipaddr="$1"
129
130@@ -227,11 +219,6 @@
131 configure_maas_workers_rabbitmq_user "$ipaddr"
132
133 #########################################################
134- ######## add maas.conf to tgt conf.d ####################
135- #########################################################
136- configure_maas_tgt
137-
138- #########################################################
139 ################ Configure Database ###################
140 #########################################################
141
142
143=== modified file 'debian/maas-region-controller.postrm'
144--- debian/maas-region-controller.postrm 2012-10-11 18:16:28 +0000
145+++ debian/maas-region-controller.postrm 2012-11-21 01:21:20 +0000
146@@ -27,11 +27,6 @@
147 fi
148
149 # Delete symlink
150- if [ -L /etc/tgt/conf.d/maas.conf ]; then
151- rm -rf /etc/tgt/conf.d/maas.conf
152- fi
153-
154- # Delete symlink
155 if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
156 rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
157 fi

Subscribers

People subscribed via source and target branches