Merge lp://staging/~gabor.meszaros/openstack-charm-testing/multi-az-multi-ceph-tools-qfix into lp://staging/~openstack-charm-testers/openstack-charm-testing/multi-az-multi-ceph

Proposed by Gábor Mészáros
Status: Merged
Merged at revision: 231
Proposed branch: lp://staging/~gabor.meszaros/openstack-charm-testing/multi-az-multi-ceph-tools-qfix
Merge into: lp://staging/~openstack-charm-testers/openstack-charm-testing/multi-az-multi-ceph
Diff against target: 18 lines (+6/-5)
1 file modified
tools/create_host_aggregates.sh (+6/-5)
To merge this branch: bzr merge lp://staging/~gabor.meszaros/openstack-charm-testing/multi-az-multi-ceph-tools-qfix
Reviewer Review Type Date Requested Status
Edward Hope-Morley Approve
Review via email: mp+301262@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Edward Hope-Morley (hopem) :
review: Approve
Revision history for this message
Billy Olsen (billy-olsen) wrote :

Friendly comment that this only works with juju 1.x.

Revision history for this message
Gábor Mészáros (gabor.meszaros) wrote :

hi Billy,

thanks, Felipe has already one in queue to fix that.

Gábor Mészáros
Dedicated Services Engineer - Customer Success
Canonical | Ubuntu | Ubuntu Cloud <http://www.ubuntu.com/cloud>
Cell: +36 (30) 328-5290

On Fri, Aug 26, 2016 at 7:13 PM, Billy Olsen <email address hidden>
wrote:

> Friendly comment that this only works with juju 1.x.
>
> Diff comments:
>
> > === modified file 'tools/create_host_aggregates.sh'
> > --- tools/create_host_aggregates.sh 2016-07-04 11:02:58 +0000
> > +++ tools/create_host_aggregates.sh 2016-07-27 12:42:23 +0000
> > @@ -1,9 +1,10 @@
> > #!/bin/bash -eu
> > +usr=$(juju status|grep environment:|sed 's/environment: \([a-z]*\)/\1/')
> > for zone in az1 az2; do
> > -nova aggregate-create ${zone^^} $zone;
> > -read -a machines<<<`juju status nova-compute-$zone| grep machine:| sed
> 's/machine: "\([0-9]*\)".*/\1/'| tr -d ' '`
> > -for m in ${machines[@]}; do
> > - nova aggregate-add-host ${zone^^} juju-hopem-machine-$m
> > -done
> > + nova aggregate-details ${zone^^} &>/dev/null || nova aggregate-create
> ${zone^^} $zone;
> > + read -a machines<<<`juju status nova-compute-$zone| grep machine:|
> sed 's/machine: "\([0-9]*\)".*/\1/'| tr -d ' '`
> > + for m in ${machines[@]}; do
> > + nova aggregate-details ${zone^^} | grep -q juju-${usr}-machine-$m
> || nova aggregate-add-host ${zone^^} juju-${usr}-machine-$m
>
> This works for Juju 1.25, but in Juju 2 the instance names are different
> so it may not work there.
>
> > + done
> > done
> >
>
>
> --
> https://code.launchpad.net/~gabor.meszaros/openstack-
> charm-testing/multi-az-multi-ceph-tools-qfix/+merge/301262
> You are the owner of lp:~gabor.meszaros/openstack-
> charm-testing/multi-az-multi-ceph-tools-qfix.
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches