summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2016-10-30 07:28:31 (GMT)
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2016-11-11 08:36:41 (GMT)
commit6cb5b32227de1043933fed3542e70bc3c64f59c3 (patch)
tree5fd8396053cebe86e913391671d905b2c4c2c5ce
parent3dcb1a2d6f541449ba7d5192c7db9e09204a799b (diff)
downloaddefinitions-6cb5b32227de1043933fed3542e70bc3c64f59c3.tar.gz
Move trove & mason related systems, clusters and strata to a new trove subdirectory
Change-Id: Id71531000851293c2be834360ff543399cda3989
-rw-r--r--trove/clusters/mason-openstack.morph (renamed from clusters/mason-openstack.morph)0
-rw-r--r--trove/clusters/mason.morph (renamed from clusters/mason.morph)2
-rw-r--r--trove/clusters/trove-example.morph (renamed from clusters/trove-example.morph)2
-rw-r--r--trove/clusters/trove.baserock.org-upgrade.morph (renamed from clusters/trove.baserock.org-upgrade.morph)2
-rw-r--r--trove/strata/fail2ban-common.morph (renamed from strata/fail2ban-common.morph)2
-rw-r--r--trove/strata/fail2ban-common/fail2ban.morph (renamed from strata/fail2ban-common/fail2ban.morph)0
-rw-r--r--trove/strata/lorry-controller.morph (renamed from strata/lorry-controller.morph)2
-rw-r--r--trove/strata/lorry-controller/lorry-controller.morph (renamed from strata/lorry-controller/lorry-controller.morph)0
-rw-r--r--trove/strata/python3-core.morph (renamed from strata/python3-core.morph)2
-rw-r--r--trove/strata/python3-core/pyyaml.morph (renamed from strata/python3-core/pyyaml.morph)0
-rw-r--r--trove/strata/trove.morph (renamed from strata/trove.morph)22
-rw-r--r--trove/strata/trove/cgit.morph (renamed from strata/trove/cgit.morph)0
-rw-r--r--trove/strata/trove/clod.morph (renamed from strata/trove/clod.morph)0
-rw-r--r--trove/strata/trove/gall.morph (renamed from strata/trove/gall.morph)0
-rw-r--r--trove/strata/trove/gitano.morph (renamed from strata/trove/gitano.morph)0
-rw-r--r--trove/strata/trove/lace.morph (renamed from strata/trove/lace.morph)0
-rw-r--r--trove/strata/trove/lrexlib-pcre.morph (renamed from strata/trove/lrexlib-pcre.morph)0
-rw-r--r--trove/strata/trove/lua-scrypt.morph (renamed from strata/trove/lua-scrypt.morph)0
-rw-r--r--trove/strata/trove/lua.morph (renamed from strata/trove/lua.morph)0
-rw-r--r--trove/strata/trove/luxio.morph (renamed from strata/trove/luxio.morph)0
-rw-r--r--trove/strata/trove/supple.morph (renamed from strata/trove/supple.morph)0
-rw-r--r--trove/strata/trove/trove-setup.morph (renamed from strata/trove/trove-setup.morph)0
-rw-r--r--trove/systems/trove-system-x86_64.morph (renamed from systems/trove-system-x86_64.morph)8
23 files changed, 21 insertions, 21 deletions
diff --git a/clusters/mason-openstack.morph b/trove/clusters/mason-openstack.morph
index 6a854bd..6a854bd 100644
--- a/clusters/mason-openstack.morph
+++ b/trove/clusters/mason-openstack.morph
diff --git a/clusters/mason.morph b/trove/clusters/mason.morph
index 376cf33..f69a9e1 100644
--- a/clusters/mason.morph
+++ b/trove/clusters/mason.morph
@@ -8,7 +8,7 @@ description: |
template to suit your needs. It also handles the generation of
keys to let the systems communicate.
systems:
-- morph: systems/trove-system-x86_64.morph
+- morph: trove/systems/trove-system-x86_64.morph
deploy:
red-box-v1-trove:
type: extensions/kvm
diff --git a/clusters/trove-example.morph b/trove/clusters/trove-example.morph
index 81b1c90..1317184 100644
--- a/clusters/trove-example.morph
+++ b/trove/clusters/trove-example.morph
@@ -32,7 +32,7 @@ description: |
You can find documentation for Trove at the following web address:
http://wiki.baserock.org/Trove/
systems:
-- morph: systems/trove-system-x86_64.morph
+- morph: trove/systems/trove-system-x86_64.morph
deploy-defaults:
HOSTNAME: test-trove
VCPUS: 2
diff --git a/clusters/trove.baserock.org-upgrade.morph b/trove/clusters/trove.baserock.org-upgrade.morph
index 2c54b81..cfd5d1c 100644
--- a/clusters/trove.baserock.org-upgrade.morph
+++ b/trove/clusters/trove.baserock.org-upgrade.morph
@@ -10,7 +10,7 @@ description: |
Replace the value of gbo.VERSION_LABEL above with the current date.
You can add letters if you need to upgrade multiple times in a day.
systems:
-- morph: systems/trove-system-x86_64.morph
+- morph: trove/systems/trove-system-x86_64.morph
deploy:
gbo:
upgrade-type: extensions/ssh-rsync
diff --git a/strata/fail2ban-common.morph b/trove/strata/fail2ban-common.morph
index a6d1b17..23918a6 100644
--- a/strata/fail2ban-common.morph
+++ b/trove/strata/fail2ban-common.morph
@@ -8,7 +8,7 @@ build-depends:
- morph: strata/core.morph
chunks:
- name: fail2ban
- morph: strata/fail2ban-common/fail2ban.morph
+ morph: trove/strata/fail2ban-common/fail2ban.morph
repo: upstream:fail2ban
ref: 70ba5cb0054f0869930b8cd2dc1bb836653dd289
unpetrify-ref: "0.9.3"
diff --git a/strata/fail2ban-common/fail2ban.morph b/trove/strata/fail2ban-common/fail2ban.morph
index 2f267a5..2f267a5 100644
--- a/strata/fail2ban-common/fail2ban.morph
+++ b/trove/strata/fail2ban-common/fail2ban.morph
diff --git a/strata/lorry-controller.morph b/trove/strata/lorry-controller.morph
index 5f45793..87d3ed0 100644
--- a/strata/lorry-controller.morph
+++ b/trove/strata/lorry-controller.morph
@@ -10,7 +10,7 @@ build-depends:
- morph: strata/python-wsgi.morph
chunks:
- name: lorry-controller
- morph: strata/lorry-controller/lorry-controller.morph
+ morph: trove/strata/lorry-controller/lorry-controller.morph
repo: baserock:baserock/lorry-controller
ref: dddd2e37953d795e4004b1d2722c25ec652135ad
unpetrify-ref: master
diff --git a/strata/lorry-controller/lorry-controller.morph b/trove/strata/lorry-controller/lorry-controller.morph
index 2f90a9a..2f90a9a 100644
--- a/strata/lorry-controller/lorry-controller.morph
+++ b/trove/strata/lorry-controller/lorry-controller.morph
diff --git a/strata/python3-core.morph b/trove/strata/python3-core.morph
index 18bd5cc..afacc3d 100644
--- a/strata/python3-core.morph
+++ b/trove/strata/python3-core.morph
@@ -34,7 +34,7 @@ chunks:
build-system: python3-distutils
- name: pyyaml
- morph: strata/python3-core/pyyaml.morph
+ morph: trove/strata/python3-core/pyyaml.morph
repo: upstream:pyyaml
ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
unpetrify-ref: baserock/morph
diff --git a/strata/python3-core/pyyaml.morph b/trove/strata/python3-core/pyyaml.morph
index 001f392..001f392 100644
--- a/strata/python3-core/pyyaml.morph
+++ b/trove/strata/python3-core/pyyaml.morph
diff --git a/strata/trove.morph b/trove/strata/trove.morph
index fa5c45e..8306c63 100644
--- a/strata/trove.morph
+++ b/trove/strata/trove.morph
@@ -8,12 +8,12 @@ build-depends:
- morph: strata/pcre-utils.morph
chunks:
- name: lua
- morph: strata/trove/lua.morph
+ morph: trove/strata/trove/lua.morph
repo: upstream:lua
ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642
unpetrify-ref: baserock/5.1-morph
- name: lace
- morph: strata/trove/lace.morph
+ morph: trove/strata/trove/lace.morph
repo: upstream:gitano/lace
ref: d1b540b6d361d6a1f51e53cdaab69f053340efbb
unpetrify-ref: baserock/morph
@@ -23,14 +23,14 @@ chunks:
extras/luacov:
url: upstream:gitano/luacov
- name: luxio
- morph: strata/trove/luxio.morph
+ morph: trove/strata/trove/luxio.morph
repo: upstream:luxio
ref: be9d125080b9ff2376273e21b75669b65dc88d46
unpetrify-ref: baserock/morph
build-depends:
- lua
- name: supple
- morph: strata/trove/supple.morph
+ morph: trove/strata/trove/supple.morph
repo: upstream:gitano/supple
ref: 0963e5706d78d0ae7446ea91af986de1e196eb39
unpetrify-ref: baserock/morph
@@ -41,7 +41,7 @@ chunks:
extras/luacov:
url: upstream:gitano/luacov
- name: clod
- morph: strata/trove/clod.morph
+ morph: trove/strata/trove/clod.morph
repo: upstream:gitano/clod
ref: da15894f42f48d15db997c4355d6b672371a4163
unpetrify-ref: baserock/morph
@@ -51,7 +51,7 @@ chunks:
extras/luacov:
url: upstream:gitano/luacov
- name: gall
- morph: strata/trove/gall.morph
+ morph: trove/strata/trove/gall.morph
repo: upstream:gitano/gall
ref: 11de77bd79c08a152932a3435d1921abc1020252
unpetrify-ref: baserock/morph
@@ -66,21 +66,21 @@ chunks:
extras/luacov:
url: upstream:gitano/luacov
- name: lrexlib-pcre
- morph: strata/trove/lrexlib-pcre.morph
+ morph: trove/strata/trove/lrexlib-pcre.morph
repo: upstream:lrexlib
ref: 0524a6e3ab6d50cba63c8642a875e246de53d651
unpetrify-ref: baserock/morph
build-depends:
- lua
- name: gitano
- morph: strata/trove/gitano.morph
+ morph: trove/strata/trove/gitano.morph
repo: upstream:gitano/gitano
ref: 4b8ce6875266fdd6609a217dcf2924d7d4815cc2
unpetrify-ref: baserock/morph
build-depends:
- lua
- name: cgit
- morph: strata/trove/cgit.morph
+ morph: trove/strata/trove/cgit.morph
repo: upstream:cgit
ref: dc881acb0c857c783b611c03294d79a7553a4ec7
unpetrify-ref: baserock/v0.12
@@ -88,12 +88,12 @@ chunks:
git:
url: upstream:git
- name: trove-setup
- morph: strata/trove/trove-setup.morph
+ morph: trove/strata/trove/trove-setup.morph
repo: baserock:baserock/trove-setup
ref: 1f2edd45b03a3e9d86d7c77847612c969b60b86f
unpetrify-ref: master
- name: lua-scrypt
- morph: strata/trove/lua-scrypt.morph
+ morph: trove/strata/trove/lua-scrypt.morph
repo: upstream:lua-scrypt
ref: 0d7f74cd3eab7d54fbb13294194de7ea70ac34a5
unpetrify-ref: baserock/morph
diff --git a/strata/trove/cgit.morph b/trove/strata/trove/cgit.morph
index bd373a5..bd373a5 100644
--- a/strata/trove/cgit.morph
+++ b/trove/strata/trove/cgit.morph
diff --git a/strata/trove/clod.morph b/trove/strata/trove/clod.morph
index e31ca4f..e31ca4f 100644
--- a/strata/trove/clod.morph
+++ b/trove/strata/trove/clod.morph
diff --git a/strata/trove/gall.morph b/trove/strata/trove/gall.morph
index c1f2fd4..c1f2fd4 100644
--- a/strata/trove/gall.morph
+++ b/trove/strata/trove/gall.morph
diff --git a/strata/trove/gitano.morph b/trove/strata/trove/gitano.morph
index 962224d..962224d 100644
--- a/strata/trove/gitano.morph
+++ b/trove/strata/trove/gitano.morph
diff --git a/strata/trove/lace.morph b/trove/strata/trove/lace.morph
index 7075239..7075239 100644
--- a/strata/trove/lace.morph
+++ b/trove/strata/trove/lace.morph
diff --git a/strata/trove/lrexlib-pcre.morph b/trove/strata/trove/lrexlib-pcre.morph
index 63f3b03..63f3b03 100644
--- a/strata/trove/lrexlib-pcre.morph
+++ b/trove/strata/trove/lrexlib-pcre.morph
diff --git a/strata/trove/lua-scrypt.morph b/trove/strata/trove/lua-scrypt.morph
index 141b8ec..141b8ec 100644
--- a/strata/trove/lua-scrypt.morph
+++ b/trove/strata/trove/lua-scrypt.morph
diff --git a/strata/trove/lua.morph b/trove/strata/trove/lua.morph
index 32aeb5c..32aeb5c 100644
--- a/strata/trove/lua.morph
+++ b/trove/strata/trove/lua.morph
diff --git a/strata/trove/luxio.morph b/trove/strata/trove/luxio.morph
index 29aabfa..29aabfa 100644
--- a/strata/trove/luxio.morph
+++ b/trove/strata/trove/luxio.morph
diff --git a/strata/trove/supple.morph b/trove/strata/trove/supple.morph
index 6470ba2..6470ba2 100644
--- a/strata/trove/supple.morph
+++ b/trove/strata/trove/supple.morph
diff --git a/strata/trove/trove-setup.morph b/trove/strata/trove/trove-setup.morph
index 1f49760..1f49760 100644
--- a/strata/trove/trove-setup.morph
+++ b/trove/strata/trove/trove-setup.morph
diff --git a/systems/trove-system-x86_64.morph b/trove/systems/trove-system-x86_64.morph
index 98c41d3..fa691d6 100644
--- a/systems/trove-system-x86_64.morph
+++ b/trove/systems/trove-system-x86_64.morph
@@ -14,7 +14,7 @@ strata:
- name: python2-core
morph: strata/python2-core.morph
- name: python3-core
- morph: strata/python3-core.morph
+ morph: trove/strata/python3-core.morph
- name: tools
morph: strata/tools.morph
- name: python-cliapp
@@ -36,9 +36,9 @@ strata:
- name: lorry
morph: strata/lorry.morph
- name: lorry-controller
- morph: strata/lorry-controller.morph
+ morph: trove/strata/lorry-controller.morph
- name: trove
- morph: strata/trove.morph
+ morph: trove/strata/trove.morph
- name: lighttpd-server
morph: strata/lighttpd-server.morph
- name: nfs
@@ -52,7 +52,7 @@ strata:
- name: devtools
morph: strata/devtools.morph
- name: fail2ban-common
- morph: strata/fail2ban-common.morph
+ morph: trove/strata/fail2ban-common.morph
- name: connectivity
morph: strata/connectivity.morph
configuration-extensions: