From 1f7ae3f064e5a1c8219f45f0e5b82256ed8244c7 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 23 Jul 2014 17:54:16 +0100 Subject: Add cloud-init support to some x86 systems (base, devel and Trove) This includes: - Add cloudinit-support stratum to the systems - Add cloud-init configuration extension to the systems --- base-system-x86_32-generic.morph | 2 ++ base-system-x86_64-generic.morph | 2 ++ devel-system-x86_32-generic.morph | 2 ++ devel-system-x86_64-generic.morph | 2 ++ trove-system-x86_64.morph | 2 ++ 5 files changed, 10 insertions(+) diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph index e53b2d97..ab535ea0 100644 --- a/base-system-x86_32-generic.morph +++ b/base-system-x86_32-generic.morph @@ -5,6 +5,7 @@ configuration-extensions: - simple-network - nfsboot - install-files +- cloud-init description: The set of strata required to have a basic system for a 32-bit x86 system. kind: system @@ -14,3 +15,4 @@ strata: - morph: core - morph: foundation - morph: bsp-x86_32-generic +- morph: cloudinit-support diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph index 183e331e..36332d42 100644 --- a/base-system-x86_64-generic.morph +++ b/base-system-x86_64-generic.morph @@ -5,6 +5,7 @@ configuration-extensions: - simple-network - nfsboot - install-files +- cloud-init description: The set of strata required to have a minimal system for a 64-bit x86 system. kind: system @@ -14,3 +15,4 @@ strata: - morph: core - morph: foundation - morph: bsp-x86_64-generic +- morph: cloudinit-support diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph index 28c89447..5eac853a 100644 --- a/devel-system-x86_32-generic.morph +++ b/devel-system-x86_32-generic.morph @@ -5,6 +5,7 @@ configuration-extensions: - simple-network - nfsboot - install-files +- cloud-init description: A system that is able to build other systems based on the 32-bit x86 architecture. kind: system @@ -16,3 +17,4 @@ strata: - morph: bsp-x86_32-generic - morph: tools - morph: openstack-clients +- morph: cloudinit-support diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph index 1daa45d2..2100221e 100644 --- a/devel-system-x86_64-generic.morph +++ b/devel-system-x86_64-generic.morph @@ -5,6 +5,7 @@ configuration-extensions: - simple-network - nfsboot - install-files +- cloud-init description: A system that is able to build other systems based on the 64-bit x86 architecture. kind: system @@ -16,3 +17,4 @@ strata: - morph: bsp-x86_64-generic - morph: tools - morph: openstack-clients +- morph: cloudinit-support diff --git a/trove-system-x86_64.morph b/trove-system-x86_64.morph index e65b0540..fb892d81 100644 --- a/trove-system-x86_64.morph +++ b/trove-system-x86_64.morph @@ -6,6 +6,7 @@ configuration-extensions: - fstab - simple-network - install-files +- cloud-init description: Trove server kind: system name: trove-system-x86_64 @@ -18,3 +19,4 @@ strata: - morph: trove - morph: nfs - morph: ansible +- morph: cloudinit-support -- cgit v1.2.1