summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-07-24 10:20:38 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-07-24 10:20:38 +0000
commitb688c4672680a3cdeee0d1dcf9492dd4c02f1524 (patch)
tree8b847e4bf51c204edc1a5517320e989aaae8625f
parentef11b3db09526bc568261ef72a8ee0e346b753d3 (diff)
parent1f7ae3f064e5a1c8219f45f0e5b82256ed8244c7 (diff)
downloaddefinitions-b688c4672680a3cdeee0d1dcf9492dd4c02f1524.tar.gz
Merge branch 'baserock/pedroalvarez/add-more-openstack-clients3'
Reviewed-by: Richard Maw
-rw-r--r--base-system-x86_32-generic.morph2
-rw-r--r--base-system-x86_64-generic.morph2
-rwxr-xr-xcloud-init.configure50
-rw-r--r--cloudinit-support.morph2
-rw-r--r--devel-system-x86_32-generic.morph2
-rw-r--r--devel-system-x86_64-generic.morph2
-rw-r--r--openstack-client-base-system-x86_32-generic.morph18
-rw-r--r--openstack-client-base-system-x86_64-generic.morph18
-rw-r--r--trove-system-x86_64.morph2
9 files changed, 61 insertions, 37 deletions
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/cloud-init.configure b/cloud-init.configure
new file mode 100755
index 00000000..0dd53654
--- /dev/null
+++ b/cloud-init.configure
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# Copyright (C) 2014 Codethink Limited
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#
+# This is a "morph deploy" configuration extension to enable the
+# cloud-init services.
+set -e
+
+ROOT="$1"
+
+##########################################################################
+
+set -e
+
+case "$CLOUD_INIT" in
+''|False|no)
+ exit 0
+ ;;
+True|yes)
+ echo "Configuring cloud-init"
+ ;;
+*)
+ echo Unrecognised option "$CLOUD_INIT" to CLOUD_INIT
+ exit 1
+ ;;
+esac
+
+
+ln -sf /lib/systemd/system/cloud-config.service \
+ "$ROOT/etc/systemd/system/multi-user.target.wants/cloud-config.service"
+ln -sf /lib/systemd/system/cloud-init-local.service \
+ "$ROOT/etc/systemd/system/multi-user.target.wants/cloud-init-local.service"
+ln -sf /lib/systemd/system/cloud-init.service \
+ "$ROOT/etc/systemd/system/multi-user.target.wants/cloud-init.service"
+ln -sf /lib/systemd/system/cloud-final.service \
+ "$ROOT/etc/systemd/system/multi-user.target.wants/cloud-final.service"
diff --git a/cloudinit-support.morph b/cloudinit-support.morph
index a1076006..1790ab8c 100644
--- a/cloudinit-support.morph
+++ b/cloudinit-support.morph
@@ -44,7 +44,7 @@ chunks:
build-depends: []
- name: cloud-init
repo: upstream:cloud-init
- ref: eeb4923b3528ebf4d93d8297b2d489738c3ea7c3
+ ref: 130d51acc5b0becd64e7007f9dfe41a6e022eaec
unpetrify-ref: baserock/morph
build-depends:
- boto
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/openstack-client-base-system-x86_32-generic.morph b/openstack-client-base-system-x86_32-generic.morph
deleted file mode 100644
index 21b60aff..00000000
--- a/openstack-client-base-system-x86_32-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: x86_32
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- vdaboot
-description: The set of strata required to have a minimal system for a 32-bit x86
- system suitable in OpenStack.
-kind: system
-name: openstack-client-base-system-x86_32-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_32-generic
-- morph: cloudinit-support
diff --git a/openstack-client-base-system-x86_64-generic.morph b/openstack-client-base-system-x86_64-generic.morph
deleted file mode 100644
index 977e1fbc..00000000
--- a/openstack-client-base-system-x86_64-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- vdaboot
-description: The set of strata required to have a minimal system for a 64-bit x86
- system suitable in OpenStack.
-kind: system
-name: openstack-client-base-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_64-generic
-- 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