From 44d6f90a2d5ada8d4f1feb4a1607e3ba8299a3d5 Mon Sep 17 00:00:00 2001
From: Kaspars Skels <kaspars.skels@att.com>
Date: Mon, 26 Aug 2019 15:28:55 -0500
Subject: [PATCH] MAAS improvements for DNS & NodePort

Using MAAS IP for DNS allows installation by not requiring
direct internet connectivity for PXE/bootstrap interface.

NodePort usage for genesis bootstrap helps troubleshooting
during bare-metal deployment. The NodePort is unset once the
full-site (maas-scaled) is deployed.

Change-Id: I6cab0b3cfc541d43d738f3dc144bb29d848ab718
---
 site/seaworthy/networks/physical/networks.yaml |  9 +++++----
 type/foundry/charts/ucp/comps/maas.yaml        | 10 +++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/site/seaworthy/networks/physical/networks.yaml b/site/seaworthy/networks/physical/networks.yaml
index c222eee8f..ce9b7222e 100644
--- a/site/seaworthy/networks/physical/networks.yaml
+++ b/site/seaworthy/networks/physical/networks.yaml
@@ -139,10 +139,11 @@ data:
     # Choose FQDN according to the node FQDN naming conventions at the top of
     # this document.
     domain: atlantafoundry.com
-    # List of upstream DNS forwards. Verify you can reach them from your
-    # environment. If so, you should not need to change them.
-    # TODO: This should be populated via substitution from common-addresses
-    servers: '8.8.8.8,8.8.4.4,208.67.222.222'
+    # NEWSITE-CHANGEME: Use MAAS VIP as the DNS server.
+    # MAAS has inbuilt DNS server and Debian mirror that allows nodes to be
+    # deployed without requiring routed/internet access for the PXE interface.
+    # See data.vip.maas_vip in networks/common-addresses.yaml
+    servers: '10.23.20.9'
 ...
 ---
 schema: 'drydock/NetworkLink/v1'
diff --git a/type/foundry/charts/ucp/comps/maas.yaml b/type/foundry/charts/ucp/comps/maas.yaml
index 71ebffad4..94b93e9a9 100644
--- a/type/foundry/charts/ucp/comps/maas.yaml
+++ b/type/foundry/charts/ucp/comps/maas.yaml
@@ -20,5 +20,13 @@ metadata:
         path: .vip.maas_vip
       dest:
         path: .values.network.maas_ingress.addr
-data: {}
+data:
+  values:
+    network:
+      region_api:
+        # Enable NodePort for initial genesis deployment.
+        # This helps with early deployment of bare-metal servers
+        # and is later removed by maas-scaled overrides
+        node_port:
+          enabled: true
 ...