From 5030dd9130fa6ef238adb641d195550c76893fb6 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Tue, 18 Nov 2014 10:15:06 +0000
Subject: Remove distbuild-system-x86_64-openstack system

Now the build systems have the openstack-clients stratum,
and this system is not longer needed.
---
 clusters/mason-openstack.morph                  |  2 +-
 systems/distbuild-system-x86_64-openstack.morph | 34 -------------------------
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 systems/distbuild-system-x86_64-openstack.morph

diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.morph
index bea73dda..6ef14888 100644
--- a/clusters/mason-openstack.morph
+++ b/clusters/mason-openstack.morph
@@ -4,7 +4,7 @@ description: |
   This is a template cluster morphology that can be adapted to set up a
   Mason.  Masons are composed of a trove and a distbuild system.
 systems:
-- morph: systems/distbuild-system-x86_64-openstack.morph
+- morph: systems/build-system-x86_64.morph
   deploy-defaults:
     ARTIFACT_CACHE_SERVER: example-cache-server
     CONTROLLERHOST: controller-hostname
diff --git a/systems/distbuild-system-x86_64-openstack.morph b/systems/distbuild-system-x86_64-openstack.morph
deleted file mode 100644
index aab6b08f..00000000
--- a/systems/distbuild-system-x86_64-openstack.morph
+++ /dev/null
@@ -1,34 +0,0 @@
-name: distbuild-system-x86_64
-kind: system
-description: Morph distributed build node for x86_64
-arch: x86_64
-strata:
-- name: build-essential
-  morph: strata/build-essential.morph
-- name: core
-  morph: strata/core.morph
-- name: foundation
-  morph: strata/foundation.morph
-- name: bsp-x86_64-generic
-  morph: strata/bsp-x86_64-generic.morph
-- name: tools
-  morph: strata/tools.morph
-- name: morph-utils
-  morph: strata/morph-utils.morph
-- name: nfs
-  morph: strata/nfs.morph
-- name: ansible
-  morph: strata/ansible.morph
-- name: cloudinit-support
-  morph: strata/cloudinit-support.morph
-- name: openstack-clients
-  morph: strata/openstack-clients.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- nfsboot
-- install-files
-- distbuild
-- fstab
-- mason
-- cloud-init
-- 
cgit v1.2.1