summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-10-06 09:26:30 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-10-06 09:26:30 (GMT)
commita557e304358d3e1b7a9626142791acee78188a72 (patch)
tree67496862078e8deb03747e41681caf93e53cc329
parent17067a594df8683e533ec2e4cde8c66db5796a77 (diff)
parent43e9727f93571164253ae4d5a093e854406f8f93 (diff)
downloaddefinitions-a557e304358d3e1b7a9626142791acee78188a72.tar.gz
Merge remote-tracking branch 'origin/baserock/sam/distbuild-ansible-fix'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk>
-rw-r--r--systems/distbuild-system-armv7lhf-highbank.morph6
-rw-r--r--systems/distbuild-system-armv7lhf-jetson.morph6
-rw-r--r--systems/distbuild-system-ppc64.morph6
-rw-r--r--systems/distbuild-system-x86_32.morph6
4 files changed, 24 insertions, 0 deletions
diff --git a/systems/distbuild-system-armv7lhf-highbank.morph b/systems/distbuild-system-armv7lhf-highbank.morph
index 112883b..1bf8c27 100644
--- a/systems/distbuild-system-armv7lhf-highbank.morph
+++ b/systems/distbuild-system-armv7lhf-highbank.morph
@@ -17,6 +17,10 @@ strata:
morph: strata/nfs.morph
- name: distbuild
morph: strata/distbuild.morph
+- name: ansible
+ morph: strata/ansible.morph
+- name: cloudinit-support
+ morph: strata/cloudinit-support.morph
configuration-extensions:
- set-hostname
- add-config-files
@@ -25,3 +29,5 @@ configuration-extensions:
- install-files
- distbuild
- fstab
+- mason
+- cloud-init
diff --git a/systems/distbuild-system-armv7lhf-jetson.morph b/systems/distbuild-system-armv7lhf-jetson.morph
index 8423264..3171da5 100644
--- a/systems/distbuild-system-armv7lhf-jetson.morph
+++ b/systems/distbuild-system-armv7lhf-jetson.morph
@@ -17,6 +17,10 @@ strata:
morph: strata/nfs.morph
- name: distbuild
morph: strata/distbuild.morph
+- name: ansible
+ morph: strata/ansible.morph
+- name: cloudinit-support
+ morph: strata/cloudinit-support.morph
configuration-extensions:
- set-hostname
- add-config-files
@@ -25,3 +29,5 @@ configuration-extensions:
- install-files
- distbuild
- fstab
+- mason
+- cloud-init
diff --git a/systems/distbuild-system-ppc64.morph b/systems/distbuild-system-ppc64.morph
index e8c5704..a7e0369 100644
--- a/systems/distbuild-system-ppc64.morph
+++ b/systems/distbuild-system-ppc64.morph
@@ -17,6 +17,10 @@ strata:
morph: strata/nfs.morph
- name: distbuild
morph: strata/distbuild.morph
+- name: ansible
+ morph: strata/ansible.morph
+- name: cloudinit-support
+ morph: strata/cloudinit-support.morph
configuration-extensions:
- set-hostname
- add-config-files
@@ -25,3 +29,5 @@ configuration-extensions:
- install-files
- distbuild
- fstab
+- mason
+- cloud-init
diff --git a/systems/distbuild-system-x86_32.morph b/systems/distbuild-system-x86_32.morph
index f207867..f224281 100644
--- a/systems/distbuild-system-x86_32.morph
+++ b/systems/distbuild-system-x86_32.morph
@@ -17,6 +17,10 @@ strata:
morph: strata/nfs.morph
- name: distbuild
morph: strata/distbuild.morph
+- name: ansible
+ morph: strata/ansible.morph
+- name: cloudinit-support
+ morph: strata/cloudinit-support.morph
configuration-extensions:
- set-hostname
- add-config-files
@@ -25,3 +29,5 @@ configuration-extensions:
- install-files
- distbuild
- fstab
+- mason
+- cloud-init