summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Gorshunov <roman.gorshunov@att.com>2018-10-22 13:17:51 +0200
committerRoman Gorshunov <roman.gorshunov@att.com>2018-10-22 13:40:04 +0200
commitcf3b7938d7870c03c4f2d0d5dbff41cad773989e (patch)
tree760dba8d9ae68353f8a3798ebfd452950e116ea6
parent1e43bdcbc6a1d7828d445f7093c2df4b82d9d00c (diff)
fix: Support setting node domains: add node_domain to other sites
Adding node_domain to other sites to make promenade render documents w/o errors [0]. [0] http://lists.airshipit.org/pipermail/airship-discuss/2018-October/000147.html Depends-On: Ie5890cd3b962f69429b93ee182ef25dd788f8b94 Change-Id: I418cb43dfbe67dab1d20ebeefada16c4c45c7bb2
Notes
Notes (review): Code-Review+2: Felipe Monteiro <felipe.monteiro@att.com> Code-Review+2: Scott Hussey <sthussey@att.com> Workflow+1: Scott Hussey <sthussey@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 23 Oct 2018 13:47:13 +0000 Reviewed-on: https://review.openstack.org/612352 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--deployment_files/global/v1.0dev/profiles/genesis.yaml6
-rw-r--r--deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml26
-rw-r--r--deployment_files/site/demo/networks/common-addresses.yaml1
-rw-r--r--deployment_files/site/dev-proxy/networks/common-addresses.yaml1
-rw-r--r--deployment_files/site/dev/networks/common-addresses.yaml1
5 files changed, 28 insertions, 7 deletions
diff --git a/deployment_files/global/v1.0dev/profiles/genesis.yaml b/deployment_files/global/v1.0dev/profiles/genesis.yaml
index 6494f28..fe0eb09 100644
--- a/deployment_files/global/v1.0dev/profiles/genesis.yaml
+++ b/deployment_files/global/v1.0dev/profiles/genesis.yaml
@@ -61,6 +61,12 @@ metadata:
61 path: .genesis.ip 61 path: .genesis.ip
62 dest: 62 dest:
63 path: .ip 63 path: .ip
64 - src:
65 schema: pegleg/CommonAddresses/v1
66 name: common-addresses
67 path: .dns.node_domain
68 dest:
69 path: .domain
64data: 70data:
65 armada: 71 armada:
66 target_manifest: cluster-bootstrap 72 target_manifest: cluster-bootstrap
diff --git a/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml b/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml
index c6f90bf..8fd4a3c 100644
--- a/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml
+++ b/deployment_files/global/v1.0dev/schemas/promenade/Genesis/v1.yaml
@@ -57,6 +57,22 @@ data:
57 57
58 type: object 58 type: object
59 properties: 59 properties:
60 armada:
61 type: object
62 properties:
63 target_manifest:
64 type: string
65 additionalProperties: false
66
67 apiserver:
68 type: object
69 properties:
70 command_prefix:
71 type: array
72 items:
73 type: string
74 additionalProperties: false
75
60 files: 76 files:
61 type: array 77 type: array
62 items: 78 items:
@@ -65,15 +81,12 @@ data:
65 hostname: 81 hostname:
66 $ref: '#/definitions/hostname' 82 $ref: '#/definitions/hostname'
67 83
84 domain:
85 type: string
86
68 ip: 87 ip:
69 $ref: '#/definitions/ip_address' 88 $ref: '#/definitions/ip_address'
70 89
71 armada:
72 properties:
73 target_manifest:
74 type: string
75 additionalProperties: false
76
77 labels: 90 labels:
78 properties: 91 properties:
79 static: 92 static:
@@ -125,7 +138,6 @@ data:
125 required: 138 required:
126 - hostname 139 - hostname
127 - ip 140 - ip
128 - armada
129 - images 141 - images
130 - labels 142 - labels
131 additionalProperties: false 143 additionalProperties: false
diff --git a/deployment_files/site/demo/networks/common-addresses.yaml b/deployment_files/site/demo/networks/common-addresses.yaml
index 4440f11..a74b7ae 100644
--- a/deployment_files/site/demo/networks/common-addresses.yaml
+++ b/deployment_files/site/demo/networks/common-addresses.yaml
@@ -56,6 +56,7 @@ data:
56 56
57 dns: 57 dns:
58 cluster_domain: cluster.local 58 cluster_domain: cluster.local
59 node_domain: gate.local
59 service_ip: 10.96.0.10 60 service_ip: 10.96.0.10
60 upstream_servers: 61 upstream_servers:
61 - 8.8.8.8 62 - 8.8.8.8
diff --git a/deployment_files/site/dev-proxy/networks/common-addresses.yaml b/deployment_files/site/dev-proxy/networks/common-addresses.yaml
index 7c63fde..de87d48 100644
--- a/deployment_files/site/dev-proxy/networks/common-addresses.yaml
+++ b/deployment_files/site/dev-proxy/networks/common-addresses.yaml
@@ -56,6 +56,7 @@ data:
56 56
57 dns: 57 dns:
58 cluster_domain: cluster.local 58 cluster_domain: cluster.local
59 node_domain: gate.local
59 service_ip: 10.96.0.10 60 service_ip: 10.96.0.10
60 upstream_servers: 61 upstream_servers:
61 - 8.8.8.8 62 - 8.8.8.8
diff --git a/deployment_files/site/dev/networks/common-addresses.yaml b/deployment_files/site/dev/networks/common-addresses.yaml
index 4440f11..a74b7ae 100644
--- a/deployment_files/site/dev/networks/common-addresses.yaml
+++ b/deployment_files/site/dev/networks/common-addresses.yaml
@@ -56,6 +56,7 @@ data:
56 56
57 dns: 57 dns:
58 cluster_domain: cluster.local 58 cluster_domain: cluster.local
59 node_domain: gate.local
59 service_ip: 10.96.0.10 60 service_ip: 10.96.0.10
60 upstream_servers: 61 upstream_servers:
61 - 8.8.8.8 62 - 8.8.8.8