Merge into trunk : doc-smaller-ipv6-tweak : Code : MAAS

Status:	Merged
Approved by:	Jeroen T. Vermeulen on 2014-10-08
Approved revision:	no longer in the source branch.
Merged at revision:	3203
Proposed branch:	lp:~jtv/maas/doc-smaller-ipv6-tweak
Merge into:	lp:~maas-committers/maas/trunk
Diff against target:	11 lines (+1/-1) 1 file modified docs/ipv6.rst (+1/-1)
To merge this branch:	bzr merge lp:~jtv/maas/doc-smaller-ipv6-tweak
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Raphaël Badin (community)		2014-10-08	Approve on 2014-10-08
Review via email: mp+237534@code.launchpad.net

Commit message

Make documentation for disable_ipv4 button match the actual UI text.

Revision history for this message

Raphaël Badin (rvb) wrote on 2014-10-08:

#

Looks good. It's a trivial fix to the documentation so it has no impact on the package.

review: Approve

Revision history for this message

MAAS Lander (maas-lander) wrote on 2014-10-08:

#

Download full text (18.7 KiB)

The attempt to merge lp:~jtv/maas/doc-smaller-ipv6-tweak into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:1 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates Release [59.7 kB]
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [126 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [86.7 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [338 kB]
Get:6 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [210 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Fetched 821 kB in 3s (258 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools gjs ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-ps...

The attempt to merge lp:~jtv/maas/doc-smaller-ipv6-tweak into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:1 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates Release [59.7 kB]
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [126 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [86.7 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [338 kB]
Get:6 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [210 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Fetched 821 kB in 3s (258 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools gjs ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-testtools python-twisted python-txamqp python-txtftp python-tz python-virtualenv python-yaml python-zope.interface syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version.
bind9 is already the newest version.
bind9utils is already the newest version.
build-essential is already the newest version.
debhelper is already the newest version.
distro-info is already the newest version.
dnsutils is already the newest version.
isc-dhcp-common is already the newest version.
libjs-raphael is already the newest version.
libjs-yui3-full is already the newest version.
libjs-yui3-min is already the newest version.
make is already the newest version.
pep8 is already the newest version.
postgresql is already the newest version.
pyflakes is already the newest version.
python-amqplib is already the newest version.
python-celery is already the newest version.
python-convoy is already the newest version.
python-crochet is already the newest version.
python-curtin is already the newest version.
python-dev is already the newest version.
python-distro-info is already the newest version.
python-django-piston is already the newest version.
python-django-south is already the newest version.
python-djorm-ext-pgarray is already the newest version.
python-docutils is already the newest version.
python-extras is already the newest version.
python-fixtures is already the newest version.
python-formencode is already the newest version.
python-httplib2 is already the newest version.
python-jinja2 is already the newest version.
python-jsonschema is already the newest version.
python-lockfile is already the newest version.
python-mimeparse is already the newest version.
python-mock is already the newest version.
python-netaddr is already the newest version.
python-netifaces is already the newest version.
python-nose is already the newest version.
python-oauth is already the newest version.
python-oops is already the newest version.
python-oops-amqp is already the newest version.
python-oops-datedir-repo is already the newest version.
python-oops-twisted is already the newest version.
python-oops-wsgi is already the newest version.
python-openssl is already the newest version.
python-paramiko is already the newest version.
python-psycopg2 is already the newest version.
python-pyinotify is already the newest version.
python-simplejson is already the newest version.
python-subunit is already the newest version.
python-tempita is already the newest version.
python-testresources is already the newest version.
python-testscenarios is already the newest version.
python-testtools is already the newest version.
python-twisted is already the newest version.
python-txamqp is already the newest version.
python-txtftp is already the newest version.
python-tz is already the newest version.
python-yaml is already the newest version.
python-zope.interface is already the newest version.
syslinux-common is already the newest version.
tgt is already the newest version.
ubuntu-cloudimage-keyring is already the newest version.
wget is already the newest version.
bzr-builddeb is already the newest version.
daemontools is already the newest version.
ipython is already the newest version.
python-cssselect is already the newest version.
python-flake8 is already the newest version.
python-hivex is already the newest version.
python-pip is already the newest version.
python-pocket-lint is already the newest version.
python-virtualenv is already the newest version.
apache2 is already the newest version.
curl is already the newest version.
dh-apport is already the newest version.
firefox is already the newest version.
freeipmi-tools is already the newest version.
libpq-dev is already the newest version.
python-bzrlib is already the newest version.
python-django is already the newest version.
python-lxml is already the newest version.
python-pexpect is already the newest version.
python-seamicroclient is already the newest version.
python-simplestreams is already the newest version.
python-sphinx is already the newest version.
xvfb is already the newest version.
gjs is already the newest version.
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    purge 
Reading package lists...
Building dependency tree...
Reading state information...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.l9jB6F/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.l9jB6F/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
rm -f -r bin include lib local
rm -f -r eggs develop-eggs
rm -f -r build dist logs/* parts
rm -f tags TAGS .installed.cfg
rm -f -r *.egg *.egg-info src/*.egg-info
rm -f -r run/* services/*/supervise
virtualenv --python=python2.7 --system-site-packages /tmp/tarmac/branch.l9jB6F
New python executable in /tmp/tarmac/branch.l9jB6F/bin/python2.7
Also creating executable in /tmp/tarmac/branch.l9jB6F/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python2.7
bin/python -m pip --quiet install --ignore-installed \
	    --no-dependencies bootstrap/zc.buildout-1.5.2.tar.gz
rm -f -f README.txt  # zc.buildout installs an annoying README.txt.
bin/buildout install database
Creating directory '/tmp/tarmac/branch.l9jB6F/parts'.
Creating directory '/tmp/tarmac/branch.l9jB6F/develop-eggs'.
Installing database.
Generated script '/tmp/tarmac/branch.l9jB6F/bin/database'.
bin/buildout install repl
Installing repl.
Generated script '/tmp/tarmac/branch.l9jB6F/bin/ipy'.
Generated interpreter '/tmp/tarmac/branch.l9jB6F/bin/py'.
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Installing maas.
Generated script '/tmp/tarmac/branch.l9jB6F/bin/maas-region-admin'.
bin/buildout install maas-test
Installing maas-test.
Generated script '/tmp/tarmac/branch.l9jB6F/bin/test.maas'.
bin/buildout install maascli
Installing maascli.
Generated script '/tmp/tarmac/branch.l9jB6F/bin/maas'.
bin/buildout install maascli-test
Installing maascli-test.
Generated script '/tmp/tarmac/branch.l9jB6F/bin/test.maascli'.
bin/buildout install maastesting-test
Installing maastesting-test.
Generated script '/tmp/tarmac/branch.l9jB6F/bin/test.maastesting'.
bin/buildout install pserv
Installing pserv.
Generated script '/tmp/tarmac/branch.l9jB6F/bin/maas-provision'.
Generated script '/tmp/tarmac/branch.l9jB6F/bin/twistd.pserv'.
bin/buildout install pserv-test
Installing pserv-test.
Generated script '/tmp/tarmac/branch.l9jB6F/bin/test.pserv'.
bin/buildout install config-test
Installing config-test.
Generated script '/tmp/tarmac/branch.l9jB6F/bin/test.config'.
bin/buildout install maas-probe-dhcp
Installing maas-probe-dhcp.
Generated script '/tmp/tarmac/branch.l9jB6F/bin/maas-probe-dhcp'.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.l9jB6F/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.l9jB6F/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Updating maas.
bin/buildout install maas-test
Updating maas-test.
echo bin/test.config bin/test.maas bin/test.maascli bin/test.maastesting bin/test.pserv | xargs -n1 env
nosetests --exclude=provisioningserver --exclude=maastesting --exclude=maascli --logging-level=INFO --verbosity=1
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

..............................................
----------------------------------------------------------------------
Ran 46 tests in 0.450s

OK
..S...............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S....................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S...........................................................................................................................................S...................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................F.....................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................SS.....................................................................................................................................................................................
======================================================================
FAIL: maasserver.tests.test_networking_preseed.TestComposeCurtinNetworkPreseedFor.test__composes_config
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/tmp/tarmac/branch.l9jB6F/src/maasserver/tests/test_networking_preseed.py", line 797, in test__composes_config
    self.assertThat(fake, MockCalledOnceWith(node, expected_config))
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 406, in assertThat
    raise mismatch_error
MismatchError: Expected call: mock(<Node: node-612e3564-4ebb-11e4-aa54-fa163e3ef03d (5Xf24xXq4QPxD3Y04xN8)>, {u'nameservers': ['182.179.107.153'], u'interfaces': [d6:57:cf:fc:36:8a], u'gateways_mapping': {d6:57:cf:fc:36:8a: ['182.179.107.50']}, u'ips_mapping': {}, u'auto_interfaces': [d6:57:cf:fc:36:8a]})
Actual call: mock(<Node: node-612e3564-4ebb-11e4-aa54-fa163e3ef03d (5Xf24xXq4QPxD3Y04xN8)>, {u'nameservers': [], u'interfaces': [d6:57:cf:fc:36:8a], u'gateways_mapping': {u'd6:57:cf:fc:36:8a': [u'182.179.107.50']}, u'ips_mapping': {}, u'auto_interfaces': [u'd6:57:cf:fc:36:8a']})

----------------------------------------------------------------------
Ran 3668 tests in 327.346s

FAILED (SKIP=6, failures=1)
..............................................................................................................................
----------------------------------------------------------------------
Ran 126 tests in 2.089s

OK
.............................................................S........................................................................................
----------------------------------------------------------------------
Ran 150 tests in 37.523s

OK (SKIP=1)
.........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 1593 tests in 17.756s

OK
make: *** [test] Error 123

Revision history for this message

Jeroen T. Vermeulen (jtv) wrote on 2014-10-08:

#

Oops. Spurious test failure. Landing the doc tweak, and tracking down the source of the failure.

1	=== modified file 'docs/ipv6.rst'
2	--- docs/ipv6.rst 2014-10-08 03:37:21 +0000
3	+++ docs/ipv6.rst 2014-10-08 06:52:37 +0000
4	@@ -119,7 +119,7 @@
5
6	For advanced users, there is an experimental capability to deploy nodes with
7	pure IPv6, with IPv4 networking disabled. To enable this on a node, check the
8	-"Disable IPv4 on deployment" box on the node's Edit page. The process of
9	+"Disable IPv4 when deployed" box on the node's Edit page. The process of
10	managing and deploying the node will still largely work through IPv4, but once
11	deployed, the node will have IPv6 networking only.
12

MAAS

Merge lp:~jtv/maas/doc-smaller-ipv6-tweak into lp:~maas-committers/maas/trunk

Commit message

Description of the change

Preview Diff

Subscribers