/juju

upgrades: add Environ upgrade infrastructure #6818

Merged
merged 2 commits into from Jan 19, 2017

Conversation

Reviewers

@mjs mjs

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@axw @jujubot @mjs
@axw
Member

axw commented Jan 17, 2017

Introduce the environs.Upgrader interface, an
optional interface that an Environ may
implement to upgrade environments.

One significant logical change in this PR is that
we no longer short-circuit the upgrade steps
worker, when there are no upgrade operations
to execute. This change is due to the fact that
it is no longer possible to statically determine
a lack of upgrade operations, since there may
or may not be upgradeable Environs in the
controller.

This is part of the fix for https://bugs.launchpad.net/juju/+bug/1656723
@axw
upgrades: add Environ upgrade infrastructure 
Introduce the environs.Upgrader interface, an
optional interface that an Environ may
implement to upgrade environments.
09b6c15
@axw
Member

axw commented Jan 17, 2017 •
Edited 1 time

QA

(along with some as-yet unpublished azure changes)

  1. bootstrap juju 2.0
  2. upgrade-juju
  3. observe environ upgrades are applied, agent is operational
  4. upgrade again, no upgrade steps run, agent is operational

@axw axw referenced this pull request Jan 18, 2017

Merged

provider/azure: create common resources once only #6826

@mjs

mjs approved these changes Jan 19, 2017
View changes

@axw
Member

axw commented Jan 19, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Jan 19, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit 3a0c114 into juju:develop Jan 19, 2017

jujubot added a commit that referenced this pull request Jan 19, 2017

@jujubot
Merge pull request #6826 from axw/lp1656723-azure-firewaller 
provider/azure: create common resources once only

Create common resources (storage account, vnet, nsg)
once only, when creating the model. For bootstrap,
we do this along with the bootstrap machine as we
already did. For non-controller models, we create
a deployment for the common resources at model
creation time. Because deployments can take a while,
and model creation is synchronous, we do the common
resource creation asynchronously and wait for its
completion before starting any machines.

There is an Environ upgrade step added that creates
a common resource deployment in non-controller
models. The upgrade step will preserve application-
specific network security rules.

Requires #6818

Fixes https://bugs.launchpad.net/juju/+bug/1656723
42c1387
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment