summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-15 14:53:39 +0000
committerGerrit Code Review <review@openstack.org>2018-10-15 14:53:39 +0000
commitfb33c902050489490d253bccd5cdeb79ac05d94a (patch)
tree65e89c7873043a4ecf6385dfdd47ea50d69edef8
parent8695f97b83403efef12dad6f7ccf0fc055e6315f (diff)
parent1e93afe00d5be71777ca667f463167b239b87495 (diff)
Merge "Support setting node domains"
-rw-r--r--deployment_files/global/v1.0demo/profiles/genesis.yaml6
-rw-r--r--deployment_files/global/v1.0demo/schemas/promenade/Genesis/v1.yaml27
-rw-r--r--deployment_files/site/gate-multinode/baremetal/bootactions.yaml2
-rw-r--r--deployment_files/site/gate-multinode/networks/common-addresses.yaml1
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 8107d39..cfbc04c 100644
--- a/deployment_files/global/v1.0demo/profiles/genesis.yaml
+++ b/deployment_files/global/v1.0demo/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.0demo/schemas/promenade/Genesis/v1.yaml b/deployment_files/global/v1.0demo/schemas/promenade/Genesis/v1.yaml
index c6f90bf..12f9b5b 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:
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,7 @@ 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
144...
diff --git a/deployment_files/site/gate-multinode/baremetal/bootactions.yaml b/deployment_files/site/gate-multinode/baremetal/bootactions.yaml
index 653a621..24859f3 100644
--- a/deployment_files/site/gate-multinode/baremetal/bootactions.yaml
+++ b/deployment_files/site/gate-multinode/baremetal/bootactions.yaml
@@ -15,7 +15,7 @@ data:
15 - path: /opt/promjoin.sh 15 - path: /opt/promjoin.sh
16 type: file 16 type: file
17 permissions: '555' 17 permissions: '555'
18 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 %} 18 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 %}
19 location_pipeline: 19 location_pipeline:
20 - template 20 - template
21 data_pipeline: 21 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 8b22fa5..99efb1d 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:
15 15
16 dns: 16 dns:
17 cluster_domain: cluster.local 17 cluster_domain: cluster.local
18 node_domain: gate.local
18 service_ip: 10.96.0.10 19 service_ip: 10.96.0.10
19 upstream_servers: 20 upstream_servers:
20 - 172.24.1.9 21 - 172.24.1.9