summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--baserock_gerrit/baserock_gerrit.morph2
-rw-r--r--strata/gerrit-tools.morph (renamed from baserock_gerrit/gerrit-tools.morph)0
-rw-r--r--systems/gerrit-system-x86_64.morph (renamed from baserock_gerrit/gerrit-system-x86_64.morph)2
3 files changed, 2 insertions, 2 deletions
diff --git a/baserock_gerrit/baserock_gerrit.morph b/baserock_gerrit/baserock_gerrit.morph
index 7712afd7..cf93af22 100644
--- a/baserock_gerrit/baserock_gerrit.morph
+++ b/baserock_gerrit/baserock_gerrit.morph
@@ -1,7 +1,7 @@
name: baserock_gerrit
kind: cluster
systems:
- - morph: baserock_gerrit/gerrit-system-x86_64.morph
+ - morph: systems/gerrit-system-x86_64.morph
deploy:
gerrit.baserock.org:
type: openstack
diff --git a/baserock_gerrit/gerrit-tools.morph b/strata/gerrit-tools.morph
index 69aa493b..69aa493b 100644
--- a/baserock_gerrit/gerrit-tools.morph
+++ b/strata/gerrit-tools.morph
diff --git a/baserock_gerrit/gerrit-system-x86_64.morph b/systems/gerrit-system-x86_64.morph
index 3b56e9e2..62c99821 100644
--- a/baserock_gerrit/gerrit-system-x86_64.morph
+++ b/systems/gerrit-system-x86_64.morph
@@ -51,7 +51,7 @@ strata:
morph: strata/lorry-controller.morph
- name: gerrit-tools
- morph: baserock_gerrit/gerrit-tools.morph
+ morph: strata/gerrit-tools.morph
# FIXME: 'tools' is needed mainly because rsync lives there and we need
# rsync for upgrades using system-version-manager.