Merge branch 'baserock/sam/import'

Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk>

Conflicts:
	systems/devel-system-armv7-highbank.morph
	systems/devel-system-armv7-versatile.morph
	systems/devel-system-armv7-wandboard.morph
	systems/devel-system-armv7b-highbank.morph
	systems/devel-system-armv7lhf-highbank.morph
	systems/devel-system-armv7lhf-wandboard.morph
	systems/devel-system-ppc64-generic.morph
	systems/devel-system-x86_32-generic.morph
	systems/devel-system-x86_64-generic.morph

17 files changed, 34 insertions, 0 deletions

diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 348e6576..9d4de4dd 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -23,6 +23,8 @@ strata:
   morph: strata/nodejs.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index dac00e27..a408b557 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -24,6 +24,8 @@ strata:
   morph: strata/nodejs.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
 configuration-extensions:
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index ff5077bf..6e386a94 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -24,6 +24,8 @@ strata:
   morph: strata/nodejs.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
 configuration-extensions:
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 3599ddc3..2797c00e 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -24,6 +24,8 @@ strata:
   morph: strata/nodejs.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
 configuration-extensions:
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 78cd4c5c..ad3a145c 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -19,6 +19,8 @@ strata:
   morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index 4ba469be..6804c7fb 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -20,6 +20,8 @@ strata:
   morph: strata/morph-utils.morph
 - name: openstack-clients
   morph: strata/openstack-clients.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
 configuration-extensions:
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 314eb70d..3cb93869 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -23,6 +23,8 @@ strata:
   morph: strata/nodejs.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index 53277b89..d83c46a0 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -25,6 +25,8 @@ strata:
   morph: strata/nodejs.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
 configuration-extensions:
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index 5d532882..736033d6 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -27,6 +27,8 @@ strata:
   morph: strata/nodejs.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index bad1cdee..859f8ad5 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -25,6 +25,8 @@ strata:
   morph: strata/nodejs.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
 configuration-extensions:
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index 4a47e5dd..804cf606 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -21,6 +21,8 @@ strata:
   morph: strata/openstack-clients.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index bd6a02d5..6a9cb092 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -22,6 +22,8 @@ strata:
   morph: strata/openstack-clients.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
 configuration-extensions:
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index 626dc6f7..4c882c22 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -25,6 +25,8 @@ strata:
   morph: strata/nodejs.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index 6721a191..d6fb17ec 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -26,6 +26,8 @@ strata:
   morph: strata/nodejs.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
 configuration-extensions:
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 550e436c..65a53072 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -25,6 +25,8 @@ strata:
   morph: strata/nodejs.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index 969f32b6..5a16c90b 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -26,6 +26,8 @@ strata:
   morph: strata/nodejs.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
 configuration-extensions:
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index cefe96cb..413c5b54 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -26,6 +26,8 @@ strata:
   morph: strata/nodejs.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
 configuration-extensions:
 - set-hostname
 - add-config-files