Merge lp:~sergiusens/ubuntu/wily/ubuntu-core-config/azure-datasource into lp:ubuntu/wily/ubuntu-core-config

Proposed by Sergio Schvezov on 2015-05-26
Status: Merged
Merged at revision: 30
Proposed branch: lp:~sergiusens/ubuntu/wily/ubuntu-core-config/azure-datasource
Merge into: lp:ubuntu/wily/ubuntu-core-config
Prerequisite: lp:~sergiusens/ubuntu/wily/ubuntu-core-config/frameworks-writable
Diff against target: 21 lines (+9/-0)
2 files modified
debian/changelog (+6/-0)
etc/cloud/cloud.cfg.d/99-snappy-azure.cfg (+3/-0)
To merge this branch: bzr merge lp:~sergiusens/ubuntu/wily/ubuntu-core-config/azure-datasource
Reviewer Review Type Date Requested Status
Ricardo Salveti Needs Fixing on 2015-06-08
Ben Howard (community) 2015-05-27 Approve on 2015-06-08
Michael Vogt 2015-05-26 Needs Information on 2015-05-27
Review via email: mp+260201@code.launchpad.net
To post a comment you must log in.
Michael Vogt (mvo) wrote :

Thanks, this looks good. I added Ben to ensure nothing breaks if this gets merged on azure. Is there anything else that needs changing when this lands (does it obsoletes the azure device tarball for example?).

review: Needs Information
Sergio Schvezov (sergiusens) wrote :

On Wed, May 27, 2015 at 07:41:47AM -0000, Michael Vogt wrote:
> Review: Needs Information
>
> Thanks, this looks good. I added Ben to ensure nothing breaks if this gets merged on azure. Is there anything else that needs changing when this lands (does it obsoletes the azure device tarball for example?).

Yes it obsoletes the device tarball for azure, but that is a different
step ;-)

It also allows to remove python 2 from the seeds, but we can wait for
him to answer.

Ben Howard (utlemming) wrote :

+1.

The only part that keeps this from obsoleting the Azure device tarball is the lack of "rootdelay=300." But it does remove the need for WALinuxAgent as well as Python 2.

Looks good to me.

review: Approve
Ricardo Salveti (rsalveti) wrote :

Needs merge with trunk and changelog update.

review: Needs Fixing
23. By Sergio Schvezov on 2015-07-01

Merging trunk

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 2015-06-30 16:59:57 +0000
3+++ debian/changelog 2015-07-01 15:36:26 +0000
4@@ -1,3 +1,9 @@
5+ubuntu-core-config (0.6.25) UNRELEASED; urgency=medium
6+
7+ * Adding azure cloud datasource (deprecates need for walinuxagent).
8+
9+ -- Sergio Schvezov <sergio.schvezov@canonical.com> Wed, 01 Jul 2015 12:35:15 -0300
10+
11 ubuntu-core-config (0.6.24) wily; urgency=medium
12
13 * List some extra directories (accountsservice, bluetooth, nm, usermetrics,
14
15=== added file 'etc/cloud/cloud.cfg.d/99-snappy-azure.cfg'
16--- etc/cloud/cloud.cfg.d/99-snappy-azure.cfg 1970-01-01 00:00:00 +0000
17+++ etc/cloud/cloud.cfg.d/99-snappy-azure.cfg 2015-07-01 15:36:26 +0000
18@@ -0,0 +1,3 @@
19+datasource:
20+ Azure:
21+ agent_command: "__builtin__"

Subscribers

People subscribed via source and target branches