Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(428)

Issue 14746044: provider/maas: instance and storage uniqueness

Can't Edit
Can't Publish+Mail
Start Review
Created:
10 years, 6 months ago by rog
Modified:
10 years, 6 months ago
Reviewers:
mue, rvb, mp+191413
Visibility:
Public.

Description

provider/maas: instance and storage uniqueness This merges the following branches from trunk. Fixes https://launchpad.net/bugs/1229275 ------------------------------------------------------------ revno: 1990 [merge] author: Roger Peppe <roger.peppe@canonical.com> committer: Tarmac branch nick: juju-core timestamp: Wed 2013-10-16 13:12:52 +0000 message: [r=rogpeppe] provider/maas: do not use environ-uuid As pointed out by fwereade, it could be confusing to have two things in the system that both purport to be a uuid for the environ. Also make the MAAS EnvironProvider.Validate check that we're not changing the maas-agent-name. https://codereview.appspot.com/14741045/ ------------------------------------------------------------ revno: 1989 [merge] author: Julian Edwards <julian.edwards@canonical.com> committer: Tarmac branch nick: juju-core timestamp: Wed 2013-10-16 06:11:50 +0000 message: [r=axwalk],[bug=1081247],[bug=1229275] Use the environment's UUID as a file prefix for all files in MAAS private storage to prevent different environments from overlapping. ------------------------------------------------------------ ------------------------------------------------------------ revno: 1985 [merge] author: Gavin Panella <gavin@gromper.net> committer: Tarmac branch nick: juju-core timestamp: Wed 2013-10-16 01:56:42 +0000 message: [r=wallyworld] Use environment-uuid when interacting with MAAS The environment-uuid is passed - as agent_name - to MAAS when acquiring and listing nodes. This will allow multiple Juju environments to coexist in a single MAAS user's account. In addition, it prevents environment-uuid from being set in environments.yaml, and returns an appropriate error message. This is intended to stop people from inadvertently clobbering existing environments. It also starts cleaning up MAAS's providerSuite by dropping the environ attribute in favour of makeEnviron(). The former was initialised to a half-working environ that caused strange test failures. https://codereview.appspot.com/14644045/ ------------------------------------------------------------ revno: 1984 [merge] author: Gavin Panella <gavin@gromper.net> committer: Tarmac branch nick: juju-core timestamp: Tue 2013-10-15 17:03:22 +0000 message: [r=gz] provider/maas: Add environment UUID We need a way to uniquely identify those machines in MAAS belonging to a Juju environment. Until now Juju's MAAS provider has assumed that all the machines that are allocated, are allocated to the environment that Juju is working with. This is obviously wrong, and can be disastrous. This is the first part of work on the MAAS provider to use a unique identifier for an environment. MAAS will record this identifier (called 'agent_name' in MAAS) and allow its use for filtering. This branch merely adds the UUID to the environment's config. https://codereview.appspot.com/14696043/ R=rogpeppe, rvb https://code.launchpad.net/~rogpeppe/juju-core/454-1.16-maas-changes/+merge/191413 (do not edit description out of merge proposal)

Patch Set 1 #

Patch Set 2 : provider/maas: instance and storage uniqueness #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+269 lines, -85 lines) Patch
A [revision details] View 1 chunk +2 lines, -0 lines 0 comments Download
M provider/maas/config.go View 3 chunks +22 lines, -2 lines 0 comments Download
M provider/maas/config_test.go View 3 chunks +33 lines, -3 lines 0 comments Download
M provider/maas/environ.go View 2 chunks +4 lines, -2 lines 0 comments Download
M provider/maas/environ_test.go View 17 chunks +36 lines, -36 lines 0 comments Download
M provider/maas/environprovider.go View 2 chunks +18 lines, -1 line 0 comments Download
M provider/maas/environprovider_test.go View 4 chunks +44 lines, -3 lines 0 comments Download
M provider/maas/instance_test.go View 8 chunks +15 lines, -13 lines 0 comments Download
M provider/maas/maas_test.go View 4 chunks +24 lines, -2 lines 0 comments Download
M provider/maas/storage.go View 9 chunks +22 lines, -2 lines 0 comments Download
M provider/maas/storage_test.go View 19 chunks +49 lines, -21 lines 2 comments Download

Messages

Total messages: 3
rog
Please take a look.
10 years, 6 months ago (2013-10-16 13:42:08 UTC) #1
mue
LGTM, only optical comments. https://codereview.appspot.com/14746044/diff/3001/provider/maas/storage_test.go File provider/maas/storage_test.go (right): https://codereview.appspot.com/14746044/diff/3001/provider/maas/storage_test.go#newcode401 provider/maas/storage_test.go:401: func (s *storageSuite) TestprefixWithPrivateNamespacePrefixesWithAgentName(c *gc.C) ...
10 years, 6 months ago (2013-10-16 14:04:52 UTC) #2
rvb
10 years, 6 months ago (2013-10-16 14:07:47 UTC) #3
On 2013/10/16 13:42:08, rog wrote:
> Please take a look.

LGTM
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b