TRITON-2123 cmon should omit nat zones

TritonDataCenter · May 1, 2020 · 0775ea3 · 0775ea3
1 parent 7bacab0
commit 0775ea3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/common.js b/lib/common.js
@@ -260,7 +260,11 @@ function mapVm(vm, source, cb) {
          */
         var has_core_tag = false;
         if (vm.tags['smartdc_role'] || vm.tags['manta_role']) {
-            has_core_tag = true;
+            if (vm.tags['smartdc_role'] && vm.tags['smartdc_role'] === 'nat') {
+                err = new Error('do not cache nat zone');
+            } else {
+                has_core_tag = true;
+            }
         }
         /*
          * record manta_role, if any, which will be joined with

diff --git a/lib/updater.js b/lib/updater.js
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright (c) 2019, Joyent, Inc.
+ * Copyright 2020 Joyent, Inc.
  */
 
 // jsl:ignore
@@ -56,7 +56,7 @@ function _mapAndCacheVm(vm, source, cache, log, cb) {
          */
         if (mErr) {
             log.warn({ err: mErr, skippedVm: vm},
-                'Skipping incomplete vm object');
+                'Skipping vm object');
             cb();
             return;
         } else {