Merge lp://staging/~thomnico/orange-box/mirror-dev into lp://staging/orange-box
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~thomnico/orange-box/mirror-dev |
| Merge into: | lp://staging/orange-box |
| Diff against target: |
2555 lines (+747/-727) 42 files modified
debian/changelog (+73/-11) debian/control (+13/-8) debian/install (+3/-0) debian/links (+1/-1) debian/postinst (+0/-310) debian/postrm (+0/-23) debian/preinst (+0/-136) debian/source/format (+1/-1) etc/apache2/sites-available/archive.conf (+0/-13) etc/apache2/sites-available/archive.ubuntu.com.conf (+14/-0) etc/apache2/sites-available/cdimage.ubuntu.com.conf (+14/-0) etc/apache2/sites-available/cloud-images.ubuntu.com.conf (+14/-0) etc/apache2/sites-available/ports.ubuntu.com.conf (+14/-0) etc/apache2/sites-available/releases.ubuntu.com.conf (+14/-0) etc/apache2/sites-available/ubuntu-cloud.archive.canonical.com.conf (+12/-0) etc/apache2/sites-available/ubuntu-cloud.conf (+0/-12) etc/apt/orange-box-mirror.list (+43/-20) etc/bind/named.conf.wildcard-archive (+6/-0) etc/bind/zones.wildcard-archive (+20/-0) etc/cron.d/charmstore-mirror (+0/-4) etc/cron.d/orange-box-mirror (+0/-1) etc/debconf-selections (+0/-2) etc/orangebox-mirror.state (+1/-0) etc/ucloudexclude.list (+26/-0) usr/bin/orange-box-add-node (+7/-4) usr/bin/orange-box-add-physical-nodes (+7/-2) usr/bin/orange-box-add-virtual-nodes (+24/-12) usr/bin/orange-box-amt-monitor (+3/-1) usr/bin/orange-box-apm-power-fix (+0/-38) usr/bin/orange-box-bootstrap-juju (+5/-1) usr/bin/orange-box-create-package-mirror (+14/-1) usr/bin/orange-box-demo-cleanup (+3/-1) usr/bin/orange-box-hacks (+32/-0) usr/bin/orange-box-mirror (+235/-0) usr/bin/orange-box-purge-everything (+1/-0) usr/bin/orange-box-resetproxy (+34/-0) usr/bin/orange-box-run (+21/-18) usr/bin/orange-box-setup-nat (+0/-99) usr/bin/orange-box-status-all-nodes (+11/-8) usr/lib/orange-box/templates/mirror-bind/named.conf.template (+6/-0) usr/lib/orange-box/templates/mirror-bind/zones.template (+17/-0) usr/lib/orange-box/templates/ubumirror.conf (+58/-0) |
| To merge this branch: | bzr merge lp://staging/~thomnico/orange-box/mirror-dev |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Orange Box | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch (include 2.9 modif new net as not accepted yet) ..
It add orange-box-mirror cli to sync/enable etc mirroring most of the software used.
Unmerged revisions
- 548. By Nicolas Thomas
-
Rebase on ~cpe-sa/
orange- box/staging for collaborating with other SAs * Enable local mirroring
* Reduce the number of dns redirects
* remove dep on ubumirror and do a faster sync to cloud-images
* use lftp instead of apt-mirror for cloud-archive
[ Nicolas Thomas ]
* Adding support for mirror - 547. By Nicolas Thomas
-
fix default to em1 for internal_interface
- 546. By Nicolas Thomas
-
Fix zone issue
Fix ssh-keyscan for maas asking user intervention - 545. By Nicolas Thomas
-
updates on ssh maas to ubuntu automation
modified:
debian/changelog
usr/bin/orange- box-add- virtual- nodes - 544. By Nicolas Thomas
-
releasing 2.9~ppa2
- 543. By Nicolas Thomas
-
Update source/format so zbr-buildpackages works
make ssh works correctly in add-virutal-nodesmodified:
debian/source/ format
usr/bin/orange- box-add- virtual- nodes - 542. By Nicolas Thomas
-
releasing 2.9~ppa1
- 541. By Nicolas Thomas
-
releasing 2.8~ppa1
- 540. By Nicolas Thomas
-
* Add biosdevname cmd in scripts
* Add a check/heal for VMs powermanagement ssh keys
* - 539. By Nicolas Thomas
-
releasing 2.8ubuntu1~trusty
