summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-11-18 10:15:06 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-11-18 10:15:06 (GMT)
commit90d68d55b77783054442a7f9c15de83a72f2e992 (patch)
tree8f65527cb940958d39b06b590bb530be203a8e38
parent9951a24834b26b6679bfd7ac3ab52f6d12f73716 (diff)
downloaddefinitions-baserock/pedroalvarez/openstack-in-build-systems.tar.gz
Remove distbuild-system-x86_64-openstack systembaserock/pedroalvarez/openstack-in-build-systems
Now the build systems have the openstack-clients stratum, and this system is not longer needed.
-rw-r--r--clusters/mason-openstack.morph2
-rw-r--r--systems/distbuild-system-x86_64-openstack.morph34
2 files changed, 1 insertions, 35 deletions
diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.morph
index bea73dd..6ef1488 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 aab6b08..0000000
--- 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