Support Heat Environments with the App Catalog.

See subject.

Change-Id: I77658bb24988829537aacc6c9f7130a664c41aec
This commit is contained in:
Kevin Fox 2015-09-25 13:11:39 -07:00
parent b2ab2acb3b
commit 780236a6a4
2 changed files with 9 additions and 2 deletions

View File

@ -7,7 +7,10 @@
<a ng-switch-default ng-class="extraclasses" class="btn btn-default disabled ajax-modal" href="/}">Checking</a>
<a ng-switch-when="error" ng-class="extraclasses" class="btn btn-default disabled ajax-modal" href="/">Error</a>
<a ng-switch-when="unsupported" ng-class="extraclasses" class="btn btn-default disabled ajax-modal" href="/">Unsupported</a>
<a ng-switch-when="true" ng-class="extraclasses" class="btn btn-success btn-default ajax-modal" href="{$ WEBROOT $}project/stacks/select_template?template_source=url&template_url={$ asset.attributes.url | encodeURIComponent $}">Launch</a>
<div ng-switch-when="true" ng-switch="asset.service.environment || '_undefined_'">
<a ng-switch-when="_undefined_" ng-class="extraclasses" class="btn btn-success btn-default ajax-modal" href="{$ WEBROOT $}project/stacks/select_template?template_source=url&template_url={$ asset.attributes.url | encodeURIComponent $}">Launch</a>
<a ng-switch-default ng-class="extraclasses" class="btn btn-success btn-default ajax-modal" href="{$ WEBROOT $}project/stacks/select_template?template_source=url&template_url={$ asset.attributes.url | encodeURIComponent $}&environment_source=raw&environment_data={$ asset.service.environment | encodeURIComponent $}">Launch</a>
</div>
</div>
<div ng-switch-when="glance" ng-switch="asset.attributes.indirect_url || '_undefined_'">
<a ng-switch-default ng-class="extraclasses" class="btn btn-primary btn-default" target="_blank" href="{$ asset.attributes.indirect_url $}">Install Instructions</a>

View File

@ -228,7 +228,11 @@
}
var process = function(asset) {
var url = asset.attributes.url;
heatAPI.validate({'template_url': url}, true).success(function(data) {
var args = {'template_url': url};
if ('environment' in asset.service ) {
args['environment'] = asset.service.environment;
}
heatAPI.validate(args, true).success(function(data) {
asset.validated = true;
notifyUpdate();
}).error(function(data, status) {