diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-20 12:36:58 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-20 12:36:58 +0100 |
| commit | 3972dc3a720794f2ded9fe5e6305d3fae4a6a7d7 (patch) | |
| tree | 4875e396af3ef083ee6883775e34c48e52605e2d /systems/base-system-x86_64-generic.morph | |
| parent | c368f61b0b460f120634219a5b70186c803d5bed (diff) | |
| parent | 4b9268eb9cb1f8d140f543d9c4a3aa1aa8298994 (diff) | |
| download | infrastructure-3972dc3a720794f2ded9fe5e6305d3fae4a6a7d7.tar.gz | |
Merge remote-tracking branch 'baserock/baserock/adamcoldrick/mason-2015' into sam/mason-zuul-2
Conflicts:
baserock_irclogs/systems/irclogs-x86_64.morph
hosts
scripts/licensecheck.pl
Change-Id: Ib298ce7928a8f5a23918b1226746c39e48fe705f
Diffstat (limited to 'systems/base-system-x86_64-generic.morph')
| -rw-r--r-- | systems/base-system-x86_64-generic.morph | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/systems/base-system-x86_64-generic.morph b/systems/base-system-x86_64-generic.morph index a3346a44..796c8185 100644 --- a/systems/base-system-x86_64-generic.morph +++ b/systems/base-system-x86_64-generic.morph @@ -12,11 +12,9 @@ strata: morph: strata/foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph configuration-extensions: - set-hostname - add-config-files - nfsboot - install-files -- cloud-init +- install-essential-files |