summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* stagingarea: Mount things inside dirnamebaserock/richardmaw/bugfix/stagingarea-mounts-inside-destdirRichard Maw2014-12-121-1/+3
|
* Merge branch 'sam/fix-openstack-credentials-check'Sam Thursfield2014-12-101-4/+11
|\ | | | | | | | | Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk> Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
| * openstack.check: Be more careful when claiming credentials are invalidSam Thursfield2014-12-091-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to check the user's credentials at the start of deployment, we try to run `glance image-list`. I found a situation where this command failed despite my credentials being correct. Morph outputted a misleading error message that said 'Wrong OpenStack credentials' The code now checks that the error returned by 'glance' does indeed look like a credentials error. If it doesn't, the full error output is displayed. The error I encountered now gets a message like this: ERROR: openstack.check failed with code 1: ERROR: Failed to connect to OpenStack instance at https://example.com:5000/v2.0: [('SSL routines', 'SSL3_GET_SERVER_CERTIFICATE', 'certificate verify failed')] (If you are curious, I fixed this by running `update-ca-certificates`.)
* | deploy: Note that some of the extensions listed live in definitions.gitSam Thursfield2014-12-094-14/+18
| | | | | | | | | | | | | | | | The user should be aware of this because if they aren't building baserock:baserock/definitions or a repo forked from it, those extensions won't be available. Also fix some long lines that I seem to have failed to commit already.
* | Merge remote-tracking branch 'petefoth/pf-document-extensions'Sam Thursfield2014-12-098-59/+147
|\ \ | |/ |/| | | | | Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk> Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
| * Add a reference to write.help filePete Fotheringham2014-12-083-18/+5
| |
| * initramfs write extension documentationPete Fotheringham2014-12-081-0/+6
| |
| * rawdisk write extension documentationPete Fotheringham2014-12-081-8/+34
| |
| * ssh-rsync write extension documentationPete Fotheringham2014-12-081-0/+36
| |
| * OpenStack write extension documentationPete Fotheringham2014-12-052-32/+39
| |
| * Add missing types to the docstring in the DeployPlugin.deploy() functionPete Fotheringham2014-12-051-1/+27
| |
* | Merge branch 'sam/fix-help-extensions'Sam Thursfield2014-12-082-2/+4
|\ \ | |/ |/| | | | | Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Emmet Hikory <emmet.hikory@codethink.co.uk>
| * Fix `morph help-extensions` run outside a workspaceSam Thursfield2014-12-051-1/+3
| | | | | | | | | | | | | | | | | | This command would use the sysbranchdir.open_from_within() function call to search for a system branch, which traverses all subdirectories looking for a directory. This is useful behaviour, but if the user ran `morph help-extensions` in / it'd traverse their whole filesystem before returning, which is stupid. This change means it only does the traverse if it already detected a workspace.
| * Fix `morph help-extensions` returning no itemsSam Thursfield2014-12-051-1/+1
|/ | | | | We were passing a nonsensical value for the 'kind' parameter so it would always return an empty list.
* Merge branch 'sam/build-branch-fixes'Sam Thursfield2014-12-043-6/+26
|\ | | | | | | | | Reviewed-By: Richard Maw <richard.maw@codethink.co.uk> Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
| * Give a better error when no repos are found in a system branchSam Thursfield2014-12-041-1/+13
| | | | | | | | | | Previously, if no repos were found Morph would raise 'ValueError: need more than 0 values to unpack' and leave the user with a traceback.
| * Fix finding Git directories to include in a temporary build refSam Thursfield2014-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | When running 'morph build' the code looks through all the Git repos in a system branch, to see which are involved in the build. These are then checked for local changes and have temporary build refs created in them. Due to a mistake in the logic, this would give up if it found a repo that came from elsewhere but was inside the system branch directory. So in the past some legitimate repos might have been ignored sometimes.
| * Gracefully handle Git repos in system branches with missing configSam Thursfield2014-12-041-1/+5
| | | | | | | | | | | | | | | | Previously if there were repos present in the system branch that weren't put there with `morph edit` or had lost their Morph-specific configuration entries somehow you might see this error: ERROR: Command failed: git config -z morph.repository
| * Document that GitDirectory.get_config() can raise an exceptionSam Thursfield2014-12-041-3/+7
|/ | | | Also fix wrong indent.
* Merge branch 'baserock/pedroalvarez/fix-tests'Pedro Alvarez2014-12-025-26/+33
|\ | | | | | | | | | | Reviewed-by: - Francisco Redondo Marchena - James Thomas
| * tests: Update expected git outputbaserock/pedroalvarez/fix-testsPedro Alvarez2014-12-012-4/+3
| |
| * Remove unicode charactersPedro Alvarez2014-12-011-2/+4
| |
| * Fix line lengths to be shorter than 80 columnsPedro Alvarez2014-12-012-20/+26
|/
* Merge branch 'baserock/pedroalvarez/rawdisk-to-device8'Pedro Alvarez2014-12-014-88/+107
|\ | | | | | | | | | | Reviewed-by: - Richard Maw - Sam Thursfield
| * writeexts.py: convert 'mount' to context managerbaserock/pedroalvarez/rawdisk-to-device8Pedro Alvarez2014-12-013-78/+58
| |
| * Update rawdisk.check to support device deploymentsPedro Alvarez2014-12-011-8/+10
| |
| * Modify rawdisk.write to allow the deployment to devicesPedro Alvarez2014-12-011-6/+14
| | | | | | | | | | | | | | This patch also modifies rawdisk.write to use the UPGRADE environment variable to figure out when is doing an upgrade or a fresh deployment. This change is important because os.path.isfile doesn't work with devices.
| * Split create_local_system on various methodsPedro Alvarez2014-12-011-4/+19
| | | | | | | | | | | | This way we can still use create_local_system to create a raw disk, but also reuse bits of it to be able e.g. to deploy to devices.
| * Don't loop mount when mounting a devicePedro Alvarez2014-12-011-1/+4
| |
| * Add force flag to 'mkfs.btrfs'Pedro Alvarez2014-12-011-1/+1
| | | | | | | | | | | | This way when deploying to a device it will format it without asking the user if the device already has format.
| * Add 'is_device' function to check if we are deploying to a devicePedro Alvarez2014-12-011-0/+11
|/
* Merge branch 'master' of https://github.com/petefoth/morphRichard Maw2014-12-012-3/+10
|\ | | | | | | | | | | This merges in more documentation improvements Reviewed-by: Richard Maw
| * Merge branch 'pf-document-extensions'Pete Fotheringham2014-12-015-38/+147
| |\ | | | | | | | | | Reviewed-by: Richard Maw
* | \ Merge branch 'master' of https://github.com/petefoth/morphRichard Maw2014-12-015-37/+139
|\ \ \ | |/ / |/| | | | | Reviewed-by: Richard Maw
| * | Merge branch 'pf-document-extensions'Pete Fotheringham2014-12-015-37/+139
| |\ \ |/ / / | | _ | | Reviewed-by: Richard Maw
| * Action review commentsPete Fotheringham2014-12-012-6/+28
| | | | | | | | | | - Document different ways of calling parameters - Allowed values for boolean parameters
| * More complete help documentationPete Fotheringham2014-11-281-3/+84
| |
| * Refere to .write.help file for documentationPete Fotheringham2014-11-282-26/+11
| |
| * Improve readability by adding blank linesPete Fotheringham2014-11-281-0/+6
| |
| * Add more information on existing parameters.Pete Fotheringham2014-11-261-8/+16
|/ | | | Add AUTOSTART parameter
* Merge remote-tracking branch 'pf/pf-document-extensions'Richard Maw2014-11-262-28/+30
|\ | | | | | | | | Reviewed-by: Richard Maw Reviewed-by: Pete Fotheringham
| * Document the write extension in the write.help filePete Fotheringham2014-11-262-23/+26
| | | | | | | | | | - Move docstring from .write to .write.help - Rework the content and formatting of the help information
| * Whitespace and line endings?Pete Fotheringham2014-11-251-11/+10
|/
* Merge branch 'sam/ensure-git-directory-exists'Sam Thursfield2014-11-172-12/+31
|\ | | | | | | | | Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk> Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
| * Check that directory passed to GitDirectory is a git repoSam Thursfield2014-11-172-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, creating a GitDirectory object for something that wasn't a Git repository would succeed, but most operations would raise a cliapp.AppException with the following error message: ERROR: Command failed: git config -z core.bare Now, the constructor will raise a NoGitRepoError if the directory isn't a Git repo, which (unless handled) gives the user the following sort of message: ERROR: Directory /src/ws/definitions is not a Git repository
* | Merge branch 'sam/fix-list-artifacts'Sam Thursfield2014-11-141-1/+1
|\ \ | | | | | | | | | Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
| * | Fix list-artifacts commandSam Thursfield2014-11-141-1/+1
| | | | | | | | | | | | | | | Silly mistake caused this to be broken, and there are no tests for this command inside the morph.git source tree.
* | | Merge branch 'baserock/richardmaw/fixup-ro-integrations' of ↵Richard Maw2014-11-146-101/+73
|\ \ \ | |/ / |/| | | | | | | | | | | | | | git://git.baserock.org/baserock/baserock/morph Reviewed-by: Sam Thursfield Reviewed-by: Pedro Alvarez
| * | Unrevert "Make system-integration commands use containerised_cmdline"baserock/richardmaw/fixup-ro-integrationsRichard Maw2014-11-121-55/+5
| | | | | | | | | | | | | | | The bug in the generated command lines has been fixed, so we can have this cleanup back now.
| * | Make invert_paths work more reliably for writable-allRichard Maw2014-11-122-41/+51
| | |
View Lorry Controller Status