summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-11-19 11:41:56 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-11-19 11:41:56 (GMT)
commitd38b006f062bdfc7aa0014e59d0e8894a35641ee (patch)
tree9425128e2401e3064d4f56733ca133f29e645a8d
parentc8278dc8d4e3c54613179963501ae27a09e01eda (diff)
parent5030dd9130fa6ef238adb641d195550c76893fb6 (diff)
downloaddefinitions-d38b006f062bdfc7aa0014e59d0e8894a35641ee.tar.gz
Merge branch 'baserock/pedroalvarez/openstack-in-build-systems'
Reviewed-by: - Francisco Redondo Marchena - Sam Thursfield
-rw-r--r--clusters/mason-openstack.morph2
-rw-r--r--systems/build-system-armv7lhf-highbank.morph2
-rw-r--r--systems/build-system-armv7lhf-jetson.morph2
-rw-r--r--systems/build-system-ppc64.morph2
-rw-r--r--systems/build-system-x86_32-chroot.morph2
-rw-r--r--systems/build-system-x86_32.morph2
-rw-r--r--systems/build-system-x86_64-chroot.morph2
-rw-r--r--systems/build-system-x86_64.morph2
-rw-r--r--systems/distbuild-system-x86_64-openstack.morph34
9 files changed, 15 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/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
index e26c400..8b92f26 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -21,6 +21,8 @@ strata:
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
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph
index f557722..d28b94d 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -21,6 +21,8 @@ strata:
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
diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph
index d117613..14762a6 100644
--- a/systems/build-system-ppc64.morph
+++ b/systems/build-system-ppc64.morph
@@ -21,6 +21,8 @@ strata:
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
diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph
index c77d7e3..089a26c 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -19,6 +19,8 @@ strata:
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
diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph
index 697119c..35a86e1 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -21,6 +21,8 @@ strata:
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
diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph
index b24bd8f..db3a38d 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -19,6 +19,8 @@ strata:
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
diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph
index 83a58ae..06868fe 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -21,6 +21,8 @@ strata:
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
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