Skip to content

Commit

Permalink
Merge pull request #713 from AppScale/master
Browse files Browse the repository at this point in the history
Merge PR 711 into release-3.6
  • Loading branch information
scragraham authored Sep 7, 2018
2 parents 13c328a + b36d5cf commit abd8f29
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion appscale/tools/agents/azure_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -1524,7 +1524,9 @@ def check_marketplace_image(self, parameters):
try:
image = compute_client.virtual_machine_images.get(
compatible_zone, publisher, offer, sku, version)

if not image.plan:
AppScaleLogger.warn("It is not recommended to use a non-AppScale image")
return
market_place_client = MarketplaceOrderingAgreements(credentials,
subscription_id)
term = market_place_client.marketplace_agreements.get(
Expand Down

0 comments on commit abd8f29

Please sign in to comment.