Merge pull request #745 from zhxu73/argo_deploy

Release v37-0

CHANGELOG.md

@@ -24,13 +24,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
   - <in case of vulnerabilities>
 -->
 
-## [Unreleased](https://github.com/cyverse/atmosphere/compare/v36-9...HEAD) - YYYY-MM-DD
+## [Unreleased](https://github.com/cyverse/atmosphere/compare/v37-0...HEAD) - YYYY-MM-DD
+
+
+
+## [v37-0](https://github.com/cyverse/atmosphere/compare/v36-9...v37-0) - 2020-08-13
 ### Added
   - script to create access token for users
+    ([#744](https://github.com/cyverse/atmosphere/pull/744))
 
 ### Changed
   - Using argo workflow to run ansible playbooks to deploy instance
-
+    ([#744](https://github.com/cyverse/atmosphere/pull/744))
 
 ## [v36-9](https://github.com/cyverse/atmosphere/compare/v36-8...v36-9) - 2020-06-16
 ### Fixed

docker/entrypoint.sh

@@ -65,8 +65,8 @@ else
 fi
 
 # Validate argo config
-cat $SECRETS_DIR/argo.config.yml | python -c "import yaml, json, sys; print(json.dumps(yaml.safe_load(sys.stdin.read())));" | tee /tmp/argo_config.json
-jsonschema -i /tmp/argo_config.json argo_config.schema
+cat $SECRETS_DIR/argo/config.yml | python -c "import yaml, json, sys; print(json.dumps(yaml.safe_load(sys.stdin.read())));" > /tmp/argo_config.json
+jsonschema -i /tmp/argo_config.json /opt/dev/atmosphere/docker/argo_config.schema
 rm /tmp/argo_config.json
 
 # Start services

service/argo/common.py

@@ -247,7 +247,7 @@ def read_argo_config(config_file_path=None, provider_uuid=None):
             all_config = yaml.safe_load(config_file.read())
 
         # validate config
-        if isinstance(all_config, dict):
+        if not isinstance(all_config, dict):
             raise ArgoConfigFileError("config root not key-value")
         if "default" not in all_config:
             raise ArgoConfigFileError("default missing")