diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-16 15:54:16 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-17 18:15:01 +0000 |
| commit | 80134ab9444ca26948b3a9c8ba9605058395757d (patch) | |
| tree | 0f54d7caa8bca651abf1961e3850c887caed40af | |
| parent | c6da7c18818fd66dde5fae2389506e6f4d2d6b86 (diff) | |
| download | infrastructure-80134ab9444ca26948b3a9c8ba9605058395757d.tar.gz | |
gerrit: Move system and stratum .morph files into strata/ and systems/
This is so others can reuse them without having to reuse the other stuff
in baserock_gerrit. Most likely people who are setting up a Gerrit with
Baserock will make a copy of the baserock_gerrit/ folder, rather than
reusing it directly. If they copied the .morph files then they'd miss
out on improvements made to those files in subsequent commits to
infrastructure.git.
Such users will still miss out on improvements to the Ansible modules --
hopefully we can solve that in a nice way in future, too.
| -rw-r--r-- | baserock_gerrit/baserock_gerrit.morph | 2 | ||||
| -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. |