Merge branch 'baserock/pedroalvarez/cloudinit'

Reviewed-by: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk>

6 files changed, 118 insertions, 24 deletions

diff --git a/cloudinit-support.morph b/cloudinit-support.morph
new file mode 100644
index 00000000..1bb04ef0
--- /dev/null
+++ b/cloudinit-support.morph
@@ -0,0 +1,48 @@
+name: cloudinit-support
+description: A stratum with cloudinit to fit a system in the OpenStack cloud.
+kind: stratum
+build-depends:
+- morph: build-essential
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: configobj
+  repo: upstream:configobj
+  ref: baserock/morph
+  build-depends: []
+- name: python-requests
+  repo: upstream:python-requests
+  ref: baserock/morph
+  build-depends: []
+- name: python-prettytable
+  repo: upstream:python-prettytable
+  ref: baserock/morph
+  build-depends: []
+- name: python-json-patch
+  repo: upstream:python-json-patch
+  ref: baserock/morph
+  build-depends: []
+- name: python-json-pointer
+  repo: upstream:python-json-pointer
+  ref: baserock/morph
+  build-depends:
+  - python-json-patch
+- name: python-cheetah
+  repo: upstream:python-cheetah
+  ref: baserock/morph
+  build-depends: []
+- name: cloud-init
+  repo: upstream:cloud-init
+  ref: baserock/morph
+  build-depends:
+  - configobj
+  - python-requests
+  - python-prettytable
+  - python-json-pointer
+  - python-cheetah
diff --git a/core.morph b/core.morph
index 80aa3e72..1905a450 100644
--- a/core.morph
+++ b/core.morph
@@ -192,3 +192,13 @@ chunks:
   build-depends:
   - flex
   - texinfo-tarball
+- name: python-setuptools
+  repo: upstream:python-setuptools
+  ref: baserock/morph
+  build-depends:
+  - cpython
+- name: pyyaml
+  repo: upstream:pyyaml
+  ref: baserock/morph
+  build-depends:
+  - python-setuptools
diff --git a/cross-bootstrap.morph b/cross-bootstrap.morph
index 8eaf0251..b9c3cf68 100644
--- a/cross-bootstrap.morph
+++ b/cross-bootstrap.morph
@@ -15,24 +15,14 @@ chunks:
   ref: baserock/morph
   build-depends:
   - groff
-- name: python-setuptools
-  repo: upstream:python-setuptools
-  ref: baserock/morph
-  build-depends: []
 - name: python-ttystatus
   repo: upstream:python-ttystatus
   ref: baserock/morph
   build-depends: []
-- name: pyyaml
-  repo: upstream:pyyaml
-  ref: baserock/morph
-  build-depends:
-  - python-setuptools
 - name: python-coveragepy
   repo: upstream:python-coveragepy
   ref: baserock/morph
-  build-depends:
-  - python-setuptools
+  build-depends: []
 - name: python-coverage-test-runner
   repo: upstream:python-coverage-test-runner
   ref: baserock/morph
@@ -65,7 +55,6 @@ chunks:
   - cliapp
   - cmdtest
   - python-coverage-test-runner
-  - pyyaml
 - name: rsync
   repo: upstream:rsync
   ref: baserock/morph
diff --git a/openstack-client-base-system-x86_32-generic.morph b/openstack-client-base-system-x86_32-generic.morph
new file mode 100644
index 00000000..01178ea8
--- /dev/null
+++ b/openstack-client-base-system-x86_32-generic.morph
@@ -0,0 +1,29 @@
+name: openstack-client-base-system-x86_32-generic
+description: The set of strata required to have a minimal system for a 32-bit x86
+  system suitable in OpenStack.
+kind: system
+arch: x86_32
+strata:
+- morph: build-essential
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-x86_32-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: cloudinit-support
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- vdaboot
diff --git a/openstack-client-base-system-x86_64-generic.morph b/openstack-client-base-system-x86_64-generic.morph
new file mode 100644
index 00000000..d8309373
--- /dev/null
+++ b/openstack-client-base-system-x86_64-generic.morph
@@ -0,0 +1,29 @@
+name: openstack-client-base-system-x86_64-generic
+description: The set of strata required to have a minimal system for a 64-bit x86
+  system suitable in OpenStack.
+kind: system
+arch: x86_64
+strata:
+- morph: build-essential
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: cloudinit-support
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- vdaboot
diff --git a/tools.morph b/tools.morph
index 5acecc49..c60581b7 100644
--- a/tools.morph
+++ b/tools.morph
@@ -10,24 +10,14 @@ chunks:
   repo: upstream:patch
   ref: baserock/morph
   build-depends: []
-- name: python-setuptools
-  repo: upstream:python-setuptools
-  ref: baserock/morph
-  build-depends: []
 - name: python-ttystatus
   repo: upstream:python-ttystatus
   ref: baserock/morph
   build-depends: []
-- name: pyyaml
-  repo: upstream:pyyaml
-  ref: baserock/morph
-  build-depends:
-  - python-setuptools
 - name: python-coveragepy
   repo: upstream:python-coveragepy
   ref: baserock/morph
-  build-depends:
-  - python-setuptools
+  build-depends: []
 - name: python-coverage-test-runner
   repo: upstream:python-coverage-test-runner
   ref: baserock/morph
@@ -89,7 +79,6 @@ chunks:
   - cliapp
   - cmdtest
   - python-coverage-test-runner
-  - pyyaml
 - name: pv
   repo: upstream:pv
   ref: baserock/morph