summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-06-13 10:07:08 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-06-18 16:05:50 +0000
commit35004031528b2eb86d53ef30d21dd58faeeaeba3 (patch)
tree8fad24ee004f96345c6ccf9efd2b6eb8bca4b4f3 /scripts
parenta5f21d769559eac4e570e8eecb40fe1d163e82fc (diff)
downloaddefinitions-35004031528b2eb86d53ef30d21dd58faeeaeba3.tar.gz
Make the release script check for the system name not "release"
Diffstat (limited to 'scripts')
-rw-r--r--scripts/do-release.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/do-release.py b/scripts/do-release.py
index e11e6625..ce347632 100644
--- a/scripts/do-release.py
+++ b/scripts/do-release.py
@@ -154,14 +154,14 @@ class DeployImages(object):
for system in release_cluster['systems']:
system_morph = system['morph']
- if 'release' not in system['deploy']:
+ if system_morph not in system['deploy']:
raise cliapp.AppException(
- 'In release.morph: system %s ID should be "release"' %
- system_morph)
+ 'In release.morph: system %s ID should be "%s"' %
+ (system_morph, system_morph))
# We can't override 'location' with a different value. We must use
# what's already in the morphology, and check that it makes sense.
- location = system['deploy']['release']['location']
+ location = system['deploy'][system_morph]['location']
if not os.path.samefile(os.path.dirname(location),
config.images_dir):
raise cliapp.AppException(