9:59 a.m.
Repo: git://git.baserock.org/baserock/baserock/morphs.git
Branch: baserock/pedroalvarez/cloudinit
Sha1: 9c2f8a3046b684c7405a5bb19b54371534c96ffd
The first patch is for move pyyaml from tools to core, we need pyyaml
in core to be able to build any system (base o devel) with cloudinit.
The second patch is for add cloudinit stratum and two base system to
use it. Cloudinit is needed to make the system suitable into an OpenStack
cloud, giving to the system the capacity of execute scripts at boot time.
Pedro Alvarez (2):
Move pyyaml from 'tools' to 'core'.
Add cloudinit-support Stratum morphology.
base-system-x86_32-openstack.morph | 29 ++++++++++++++++++++++
base-system-x86_64-openstack.morph | 29 ++++++++++++++++++++++
cloudinit-support.morph | 48 ++++++++++++++++++++++++++++++++++++
core.morph | 10 ++++++++
cross-bootstrap.morph | 13 +---------
tools.morph | 13 +---------
6 files changed, 118 insertions(+), 24 deletions(-)
create mode 100644 base-system-x86_32-openstack.morph
create mode 100644 base-system-x86_64-openstack.morph
create mode 100644 cloudinit-support.morph
--
1.7.10.4
9:59 a.m.
New subject: [PATCH 1/2] Move pyyaml from 'tools' to 'core'.
Also moved python-setuptools because is a dependency of pyyaml. Pyyaml
is moved to core because is a dependency of 'cloudinit-support' stratum
and moving it give us the capacity of buid base systems with cloduinit.
core.morph: added pyyaml and python-setuptools
tools.morph: deleted pyyaml and python-setuptools
cross-bootstrap.morph: deleted pyyaml and python-setuptools
---
core.morph | 10 ++++++++++
cross-bootstrap.morph | 13 +------------
tools.morph | 13 +------------
3 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/core.morph b/core.morph
index 80aa3e7..1905a45 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 8eaf025..b9c3cf6 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/tools.morph b/tools.morph
index 5acecc4..c60581b 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
--
1.7.10.4
9:59 a.m.
New subject: [PATCH 2/2] Add cloudinit-support Stratum morphology.
cloudinit-support.morph: Stratum morphology to add cloudinit. This
stratum also adds all the necessary dependencies needed. Cloudinit is
needed to provide any system the capacity of run scripts to configure
it at boot time.
base-system-x86_32-openstack.morph: baserock base system (x86_32)
optimized to deploy in OpenStack. It uses the 'vdaboot.configure'
extension to use virtio disks, and includes the 'cloudinit-support'
stratum.
base-system-x86_64-openstack.morph: baserock base system (x86_64)
optimized to deploy in OpenStack as base-system-x86_32-openstack.morph
does.
---
base-system-x86_32-openstack.morph | 29 ++++++++++++++++++++++
base-system-x86_64-openstack.morph | 29 ++++++++++++++++++++++
cloudinit-support.morph | 48 ++++++++++++++++++++++++++++++++++++
3 files changed, 106 insertions(+)
create mode 100644 base-system-x86_32-openstack.morph
create mode 100644 base-system-x86_64-openstack.morph
create mode 100644 cloudinit-support.morph
diff --git a/base-system-x86_32-openstack.morph b/base-system-x86_32-openstack.morph
new file mode 100644
index 0000000..3dc3523
--- /dev/null
+++ b/base-system-x86_32-openstack.morph
@@ -0,0 +1,29 @@
+name: base-system-x86_32-openstack
+description: The set of strata required to have a minimal system for a 32-bit x86
+ system.
+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: baserock/pedroalvarez/cloudinit
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- vdaboot
diff --git a/base-system-x86_64-openstack.morph b/base-system-x86_64-openstack.morph
new file mode 100644
index 0000000..8ff8830
--- /dev/null
+++ b/base-system-x86_64-openstack.morph
@@ -0,0 +1,29 @@
+name: base-system-x86_64-openstack
+description: The set of strata required to have a minimal system for a 64-bit x86
+ system.
+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: baserock/pedroalvarez/cloudinit
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- vdaboot
diff --git a/cloudinit-support.morph b/cloudinit-support.morph
new file mode 100644
index 0000000..1bb04ef
--- /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
--
1.7.10.4
10:23 a.m.
New subject: [PATCH 2/2] Add cloudinit-support Stratum morphology.
On Tue, Sep 24, 2013 at 03:59:50PM +0100, Pedro Alvarez wrote:
cloudinit-support.morph: Stratum morphology to add cloudinit. This
stratum also adds all the necessary dependencies needed. Cloudinit is
needed to provide any system the capacity of run scripts to configure
it at boot time.
base-system-x86_32-openstack.morph: baserock base system (x86_32)
optimized to deploy in OpenStack. It uses the 'vdaboot.configure'
extension to use virtio disks, and includes the 'cloudinit-support'
stratum.
base-system-x86_64-openstack.morph: baserock base system (x86_64)
optimized to deploy in OpenStack as base-system-x86_32-openstack.morph
does.
We've usually called our systems like $role-system-$architecture-$chipset.
So you would call these cloudinit-base-system-x86_32-generic.morph.
I have no other issues with the systems, but it's against the usual
naming scheme we have for systems, so +0
10:32 a.m.
New subject: [PATCH 2/2] Add cloudinit-support Stratum morphology.
On 24/09/13 16:23, Richard Maw wrote:
We've usually called our systems like
$role-system-$architecture-$chipset.
So you would call these cloudinit-base-system-x86_32-generic.morph.
I have no other issues with the systems, but it's against the usual
naming scheme we have for systems, so +0
Cloudinit is only one of the requirements of OpenStack. I'd prefer to
call it openstack-base-system-x86_32-generic.morph.
Can I consider you +0 an +1 if I change it during the merge?
10:37 a.m.
New subject: [PATCH 2/2] Add cloudinit-support Stratum morphology.
On Tue, Sep 24, 2013 at 04:32:01PM +0100, Pedro Alvarez wrote:
Cloudinit is only one of the requirements of OpenStack. I'd
prefer to
call it openstack-base-system-x86_32-generic.morph.
I'm not sure putting openstack in the name is a good idea, since I'd
assume that it were an openstack server rather than a client.
Can I consider you +0 an +1 if I change it during the merge?
Assuming we can agree on a name, yes.
8:30 a.m.
New subject: [PATCH 2/2] Add cloudinit-support Stratum morphology.
On Tue, Sep 24, 2013 at 04:32:01PM +0100, Pedro Alvarez wrote:
On 24/09/13 16:23, Richard Maw wrote:
> We've usually called our systems like $role-system-$architecture-$chipset.
> So you would call these cloudinit-base-system-x86_32-generic.morph.
>
> I have no other issues with the systems, but it's against the usual
> naming scheme we have for systems, so +0
Cloudinit is only one of the requirements of OpenStack. I'd prefer to
call it openstack-base-system-x86_32-generic.morph.
Would openstack-client-system-x86_32 be an acceptable system name?
* We don't need "base" in the name. It's not a base system
anymore, after all.
* I don't feel we need the "generic" part either. I think we should
drop that from the other system morphologies as well. I can live
with having it, though.
* Having "openstack" in the name seems sensible to me.
* Indicating whether a system is an OpenStack client or server seems
necessary to me.
+1 from me after we agree on a name, if the name gets changed during
merge.
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
8:41 a.m.
New subject: [PATCH 2/2] Add cloudinit-support Stratum morphology.
On Wed, Sep 25, 2013 at 02:30:34PM +0100, Lars Wirzenius wrote:
Would openstack-client-system-x86_32 be an acceptable system name?
* We don't need "base" in the name. It's not a base system
anymore, after all.
No, but that is the one it most resembles. We may decide to have openstack
devel systems too, at which point it would be openstack-client-devel...
* I don't feel we need the "generic" part either. I
think we should
drop that from the other system morphologies as well. I can live
with having it, though.
I'd prefer to keep it and remove it from all others at the same time if
we're doing that.
This naming discussion has gone on long enough, so I'm upgrading my +0
to a +1 for whatever name is finally decided.
9:28 a.m.
New subject: [PATCH 2/2] Add cloudinit-support Stratum morphology.
On 25/09/13 14:41, Richard Maw wrote:
On Wed, Sep 25, 2013 at 02:30:34PM +0100, Lars Wirzenius wrote:
> Would openstack-client-system-x86_32 be an acceptable system name?
>
> * We don't need "base" in the name. It's not a base system
> anymore, after all.
No, but that is the one it most resembles. We may decide to have openstack
devel systems too, at which point it would be openstack-client-devel...
Agree on put "base" in the name, because in the future could appear
devel system to OpenStack as Richard Maw pointed before.
If we are agree, is going to be called:
openstack-client-base-system-x86_32-generic
Anyway I don't understand why we have to put "client" in the name. There
is not going to be an "openstack-server".
9:34 a.m.
New subject: [PATCH 2/2] Add cloudinit-support Stratum morphology.
On Wed, Sep 25, 2013 at 03:28:19PM +0100, Pedro Alvarez wrote:
If we are agree, is going to be called:
openstack-client-base-system-x86_32-generic
I don't agree with having "base" in the system. It doesn't add
anything useful, in my opinion, and just makes the already long name
longer.
However, I don't object strongly enough to prevent this being merged.
Anyway I don't understand why we have to put "client"
in the name. There
is not going to be an "openstack-server".
Never? I suspect that we will have a system that acts as an OpenStack host,
and that'd then be an openstack-server-x86_64 system. But time will tell.
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
11:01 a.m.
New subject: [PATCHv2 0/2] Add cloudinit support
Repo: git://git.baserock.org/baserock/baserock/morphs.git
Branch: baserock/pedroalvarez/cloudinit
Sha1: d406cb78099fa39c38fdb4c69fce8111123875e8
This patch series are equal than the previous version, but changing
the names of the systems as we agreed on the discussion.
Pedro Alvarez (2):
Move pyyaml from 'tools' to 'core'.
Add cloudinit-support Stratum morphology.
cloudinit-support.morph | 48 +++++++++++++++++++++
core.morph | 10 +++++
cross-bootstrap.morph | 13 +-----
openstack-client-base-system-x86_32-generic.morph | 29 +++++++++++++
openstack-client-base-system-x86_64-generic.morph | 29 +++++++++++++
tools.morph | 13 +-----
6 files changed, 118 insertions(+), 24 deletions(-)
create mode 100644 cloudinit-support.morph
create mode 100644 openstack-client-base-system-x86_32-generic.morph
create mode 100644 openstack-client-base-system-x86_64-generic.morph
--
1.7.10.4
11:01 a.m.
New subject: [PATCH 1/2] Move pyyaml from 'tools' to 'core'.
Also moved python-setuptools because is a dependency of pyyaml. Pyyaml
is moved to core because is a dependency of 'cloudinit-support' stratum
and moving it give us the capacity of buid base systems with cloduinit.
core.morph: added pyyaml and python-setuptools
tools.morph: deleted pyyaml and python-setuptools
cross-bootstrap.morph: deleted pyyaml and python-setuptools
---
core.morph | 10 ++++++++++
cross-bootstrap.morph | 13 +------------
tools.morph | 13 +------------
3 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/core.morph b/core.morph
index 80aa3e7..1905a45 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 8eaf025..b9c3cf6 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/tools.morph b/tools.morph
index 5acecc4..c60581b 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
--
1.7.10.4
11:01 a.m.
New subject: [PATCH 2/2] Add cloudinit-support Stratum morphology.
cloudinit-support.morph: Stratum morphology to add cloudinit. This
stratum also adds all the necessary dependencies needed. Cloudinit is
needed to provide any system the capacity of run scripts to configure
it at boot time.
openstack-client-base-system-x86_32-generic.morph: baserock base system (x86_32)
optimized to deploy in OpenStack. It uses the 'vdaboot.configure'
extension to use virtio disks, and includes the 'cloudinit-support'
stratum.
openstack-client-base-system-x86_64-generic.morph: baserock base system (x86_64)
optimized to deploy in OpenStack as base-system-x86_32-openstack.morph
does.
---
cloudinit-support.morph | 48 +++++++++++++++++++++
openstack-client-base-system-x86_32-generic.morph | 29 +++++++++++++
openstack-client-base-system-x86_64-generic.morph | 29 +++++++++++++
3 files changed, 106 insertions(+)
create mode 100644 cloudinit-support.morph
create mode 100644 openstack-client-base-system-x86_32-generic.morph
create mode 100644 openstack-client-base-system-x86_64-generic.morph
diff --git a/cloudinit-support.morph b/cloudinit-support.morph
new file mode 100644
index 0000000..1bb04ef
--- /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/openstack-client-base-system-x86_32-generic.morph
b/openstack-client-base-system-x86_32-generic.morph
new file mode 100644
index 0000000..ccddc8f
--- /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: baserock/pedroalvarez/cloudinit
+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 0000000..1ed7abe
--- /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: baserock/pedroalvarez/cloudinit
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- vdaboot
--
1.7.10.4
3:32 a.m.
New subject: [PATCHv2 0/2] Add cloudinit support
On Wed, Sep 25, 2013 at 05:01:41PM +0100, Pedro Alvarez wrote:
Repo: git://git.baserock.org/baserock/baserock/morphs.git
Branch: baserock/pedroalvarez/cloudinit
Sha1: d406cb78099fa39c38fdb4c69fce8111123875e8
Looks good to me, +1
6:30 a.m.
New subject: [PATCHv2 0/2] Add cloudinit support
On 25/09/13 17:01, Pedro Alvarez wrote:
Repo: git://git.baserock.org/baserock/baserock/morphs.git
Branch: baserock/pedroalvarez/cloudinit
Sha1: d406cb78099fa39c38fdb4c69fce8111123875e8
Merged.
3466
days inactive
3468
days old
14 comments
3 participants
participants (3)
-
Lars Wirzenius -
Pedro Alvarez -
Richard Maw