From 1e93afe00d5be71777ca667f463167b239b87495 Mon Sep 17 00:00:00 2001
From: Scott Hussey <sthussey@att.com>
Date: Fri, 21 Sep 2018 14:40:59 +0000
Subject: [PATCH] Support setting node domains

Change-Id: Ie5890cd3b962f69429b93ee182ef25dd788f8b94
---
 .../global/v1.0demo/profiles/genesis.yaml     |  6 +++++
 .../schemas/promenade/Genesis/v1.yaml         | 27 ++++++++++++++-----
 .../gate-multinode/baremetal/bootactions.yaml |  2 +-
 .../networks/common-addresses.yaml            |  1 +
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/deployment_files/global/v1.0demo/profiles/genesis.yaml b/deployment_files/global/v1.0demo/profiles/genesis.yaml
index 8107d39a..cfbc04c8 100644
--- a/deployment_files/global/v1.0demo/profiles/genesis.yaml
+++ b/deployment_files/global/v1.0demo/profiles/genesis.yaml
@@ -61,6 +61,12 @@ metadata:
         path: .genesis.ip
       dest:
         path: .ip
+    - src:
+        schema: pegleg/CommonAddresses/v1
+        name: common-addresses
+        path: .dns.node_domain
+      dest:
+        path: .domain
 data:
   armada:
     target_manifest: cluster-bootstrap
diff --git a/deployment_files/global/v1.0demo/schemas/promenade/Genesis/v1.yaml b/deployment_files/global/v1.0demo/schemas/promenade/Genesis/v1.yaml
index c6f90bf4..12f9b5b5 100644
--- a/deployment_files/global/v1.0demo/schemas/promenade/Genesis/v1.yaml
+++ b/deployment_files/global/v1.0demo/schemas/promenade/Genesis/v1.yaml
@@ -57,6 +57,22 @@ data:
 
   type: object
   properties:
+    armada:
+      type: object
+      properties:
+        target_manifest:
+          type: string
+      additionalProperties: false
+
+    apiserver:
+      type: object
+      properties:
+        command_prefix:
+          type: array
+          items:
+            type: string
+      additionalProperties: false
+
     files:
       type: array
       items:
@@ -65,15 +81,12 @@ data:
     hostname:
       $ref: '#/definitions/hostname'
 
+    domain:
+      type: string
+
     ip:
       $ref: '#/definitions/ip_address'
 
-    armada:
-      properties:
-        target_manifest:
-          type: string
-      additionalProperties: false
-
     labels:
       properties:
         static:
@@ -125,7 +138,7 @@ data:
   required:
     - hostname
     - ip
-    - armada
     - images
     - labels
   additionalProperties: false
+...
diff --git a/deployment_files/site/gate-multinode/baremetal/bootactions.yaml b/deployment_files/site/gate-multinode/baremetal/bootactions.yaml
index 653a6210..24859f3d 100644
--- a/deployment_files/site/gate-multinode/baremetal/bootactions.yaml
+++ b/deployment_files/site/gate-multinode/baremetal/bootactions.yaml
@@ -15,7 +15,7 @@ data:
     - path: /opt/promjoin.sh
       type: file
       permissions: '555'
-      location: promenade+http://promenade-api.ucp.svc.cluster.local/api/v1.0/join-scripts?design_ref={{ action.design_ref | urlencode }}&hostname={{ node.hostname }}&ip={{ node.network.default.ip }}{% for k, v in node.labels.items() %}&labels.dynamic={{ k }}={{ v }}{% endfor %}
+      location: promenade+http://promenade-api.ucp.svc.cluster.local/api/v1.0/join-scripts?design_ref={{ action.design_ref | urlencode }}&hostname={{ node.hostname }}&ip={{ node.network.default.ip }}&domain={{ node.domain }}{% for k, v in node.labels.items() %}&labels.dynamic={{ k }}={{ v }}{% endfor %}
       location_pipeline:
         - template
       data_pipeline:
diff --git a/deployment_files/site/gate-multinode/networks/common-addresses.yaml b/deployment_files/site/gate-multinode/networks/common-addresses.yaml
index 8b22fa5c..99efb1de 100644
--- a/deployment_files/site/gate-multinode/networks/common-addresses.yaml
+++ b/deployment_files/site/gate-multinode/networks/common-addresses.yaml
@@ -15,6 +15,7 @@ data:
 
   dns:
     cluster_domain: cluster.local
+    node_domain: gate.local
     service_ip: 10.96.0.10
     upstream_servers:
       - 172.24.1.9