Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 2.5 into 2.6 on 25/06. #10375

Merged
merged 5 commits into from
Jun 25, 2019
Merged

Merge 2.5 into 2.6 on 25/06. #10375

merged 5 commits into from
Jun 25, 2019

Conversation

anastasiamac
Copy link
Contributor

Bring forward:
#10355
#10363

anastasiamac and others added 5 commits June 21, 2019 14:05
juju#10363

## Description of change

2.5 accepted error forming without a formatting directive but 2.6 insists on it. Backporting to keep codebase in sync.
juju#10355

Juju 2.5 changed the default [Azure Load Balancer SKU](https://docs.microsoft.com/en-us/azure/load-balancer/load-balancer-overview#skus) from Basic to Standard. Unfortunately, models created by Juju 2.4 get stuck when their controllers are upgraded.

This change introduces a model config parameter `load-balancer-sku-name` (name chosen to be consistent with the Azure SDK naming scheme) that allows for operators to select between Basic and Standard types. It also cleans up some of the internals of the Azure provider, which should make it friendlier to newcomers to the code.

## QA steps
```
snap install juju # (if required)
snap switch juju channel=2.4/stable
/snap/juju/current/bin/juju bootstrap azure c-az
/snap/juju/current/bin/juju deploy ubuntu
```

(Assuming `juju` is this branch)

```
juju upgrade-model -m controller --build-agent
```
>```
> no prepackaged agent binaries available, using local agent binary 2.5.8.1 (built from source)
> best version:
> 2.5.8.1
> started upgrade to 2.5.8.1
>```

```
juju model-config -m controller load-balancer-sku-name=Basic
juju add-unit ubuntu
```


## Documentation changes

Required. We need to document the new model config parameter.

## Bug reference

* https://bugs.launchpad.net/juju/+bug/1824465
@anastasiamac
Copy link
Contributor Author

$$merge$$

@jujubot jujubot merged commit 4c98b64 into juju:2.6 Jun 25, 2019
@anastasiamac anastasiamac deleted the merge-25-26-2506 branch June 25, 2019 05:33
jujubot added a commit that referenced this pull request Jun 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants