summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Strassner <strassner.bryan@gmail.com>2019-02-04 15:43:58 -0600
committerKaspars Skels <kaspars.skels@gmail.com>2019-02-05 22:10:49 +0000
commitbbfa8eada7d366f860f5d2bf394173968a8c91ae (patch)
tree3f9c986cfa2290b0b4a5ef7c221ffb5541c530cb
parent26cf5a0fc675f92d1af0cd2477ad2df09030f24a (diff)
Update Shipyard Pod Configuration
Updates to use new Shipyard pod configurations, removes node port use. Requires Shipyard commit a11e962eef5a5aa8f8fc15c4a324dfa6b2465061 or newer. Change-Id: Iff5af45d6b4f60c34d18aad821cf9afa4ea67dda
Notes
Notes (review): Code-Review+1: Drew Walters <drewwalters96@gmail.com> Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Code-Review+1: Lev Morgan <morgan.lev@gmail.com> Code-Review+2: Matt McEuen <matt.mceuen@att.com> Workflow+1: Matt McEuen <matt.mceuen@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 06 Feb 2019 02:14:23 +0000 Reviewed-on: https://review.openstack.org/634819 Project: openstack/airship-treasuremap Branch: refs/heads/master
-rw-r--r--global/software/charts/ucp/shipyard/shipyard.yaml39
-rw-r--r--global/software/config/versions.yaml10
-rw-r--r--site/airship-seaworthy/networks/common-addresses.yaml2
-rw-r--r--site/airship-seaworthy/software/config/endpoints.yaml27
-rw-r--r--site/airskiff/networks/common-addresses.yaml2
-rw-r--r--site/airskiff/software/config/endpoints.yaml27
6 files changed, 9 insertions, 98 deletions
diff --git a/global/software/charts/ucp/shipyard/shipyard.yaml b/global/software/charts/ucp/shipyard/shipyard.yaml
index 88208a7..f07c1bf 100644
--- a/global/software/charts/ucp/shipyard/shipyard.yaml
+++ b/global/software/charts/ucp/shipyard/shipyard.yaml
@@ -26,20 +26,6 @@ metadata:
26 dest: 26 dest:
27 path: .values.images.tags 27 path: .values.images.tags
28 28
29 # Node ports
30 - src:
31 schema: pegleg/CommonAddresses/v1
32 name: common-addresses
33 path: .node_ports.shipyard_api
34 dest:
35 path: .values.network.shipyard.node_port
36 - src:
37 schema: pegleg/CommonAddresses/v1
38 name: common-addresses
39 path: .node_ports.airflow_web
40 dest:
41 path: .values.network.airflow.web.node_port
42
43 # Endpoints 29 # Endpoints
44 - src: 30 - src:
45 schema: pegleg/EndpointCatalogue/v1 31 schema: pegleg/EndpointCatalogue/v1
@@ -74,18 +60,6 @@ metadata:
74 - src: 60 - src:
75 schema: pegleg/EndpointCatalogue/v1 61 schema: pegleg/EndpointCatalogue/v1
76 name: ucp_endpoints 62 name: ucp_endpoints
77 path: .ucp.airflow_web
78 dest:
79 path: .values.endpoints.airflow_web
80 - src:
81 schema: pegleg/EndpointCatalogue/v1
82 name: ucp_endpoints
83 path: .ucp.airflow_flower
84 dest:
85 path: .values.endpoints.airflow_flower
86 - src:
87 schema: pegleg/EndpointCatalogue/v1
88 name: ucp_endpoints
89 path: .ucp.airflow_oslo_messaging 63 path: .ucp.airflow_oslo_messaging
90 dest: 64 dest:
91 path: .values.endpoints.oslo_messaging 65 path: .values.endpoints.oslo_messaging
@@ -289,20 +263,15 @@ data:
289 shipyard: 263 shipyard:
290 api: 2 264 api: 2
291 airflow: 265 airflow:
292 web: 2
293 worker: 2 266 worker: 2
294 flower: 2 267 # TODO: Scheduler can be set to 0 with a future version - here to
295 scheduler: 2 268 # accommodate the upgrade to the current configuration with the
269 # Scheduler being a sidecar with the Worker.
270 scheduler: 1
296 labels: 271 labels:
297 job: 272 job:
298 node_selector_key: ucp-control-plane 273 node_selector_key: ucp-control-plane
299 node_selector_value: enabled 274 node_selector_value: enabled
300 network:
301 shipyard:
302 enable_node_port: true
303 airflow:
304 web:
305 enable_node_port: true
306 conf: 275 conf:
307 shipyard: 276 shipyard:
308 keystone_authtoken: 277 keystone_authtoken:
diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index 555dd75..40daadd 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -408,7 +408,7 @@ data:
408 type: git 408 type: git
409 shipyard: 409 shipyard:
410 location: https://git.openstack.org/openstack/airship-shipyard 410 location: https://git.openstack.org/openstack/airship-shipyard
411 reference: 6bd02eea8477bba077848463e7e740efe12fa782 411 reference: c7472d7f607bb1ee0202cebd9706754f5bb7decf
412 subpath: charts/shipyard 412 subpath: charts/shipyard
413 type: git 413 type: git
414 shipyard-htk: 414 shipyard-htk:
@@ -553,10 +553,10 @@ data:
553 promenade: quay.io/airshipit/promenade:76c942b5ce9c106f69173ab8e03319238087262a 553 promenade: quay.io/airshipit/promenade:76c942b5ce9c106f69173ab8e03319238087262a
554 rabbitmq: {} 554 rabbitmq: {}
555 shipyard: 555 shipyard:
556 airflow: quay.io/airshipit/airflow:6bd02eea8477bba077848463e7e740efe12fa782 556 airflow: quay.io/airshipit/airflow:c7472d7f607bb1ee0202cebd9706754f5bb7decf
557 airflow_db_sync: quay.io/airshipit/airflow:6bd02eea8477bba077848463e7e740efe12fa782 557 airflow_db_sync: quay.io/airshipit/airflow:c7472d7f607bb1ee0202cebd9706754f5bb7decf
558 shipyard: quay.io/airshipit/shipyard:6bd02eea8477bba077848463e7e740efe12fa782 558 shipyard: quay.io/airshipit/shipyard:c7472d7f607bb1ee0202cebd9706754f5bb7decf
559 shipyard_db_sync: quay.io/airshipit/shipyard:6bd02eea8477bba077848463e7e740efe12fa782 559 shipyard_db_sync: quay.io/airshipit/shipyard:c7472d7f607bb1ee0202cebd9706754f5bb7decf
560 tiller: {} 560 tiller: {}
561 packages: 561 packages:
562 gpgkey: |- 562 gpgkey: |-
diff --git a/site/airship-seaworthy/networks/common-addresses.yaml b/site/airship-seaworthy/networks/common-addresses.yaml
index 41b2eaf..fb22af2 100644
--- a/site/airship-seaworthy/networks/common-addresses.yaml
+++ b/site/airship-seaworthy/networks/common-addresses.yaml
@@ -103,8 +103,6 @@ data:
103 drydock_api: 30000 103 drydock_api: 30000
104 maas_api: 30001 104 maas_api: 30001
105 maas_proxy: 31800 # hardcoded in MAAS 105 maas_proxy: 31800 # hardcoded in MAAS
106 shipyard_api: 30003
107 airflow_web: 30004
108 106
109 ntp: 107 ntp:
110 # comma separated NTP server list. Verify that these upstream NTP servers are 108 # comma separated NTP server list. Verify that these upstream NTP servers are
diff --git a/site/airship-seaworthy/software/config/endpoints.yaml b/site/airship-seaworthy/software/config/endpoints.yaml
index 63eb2a7..d4fa4f9 100644
--- a/site/airship-seaworthy/software/config/endpoints.yaml
+++ b/site/airship-seaworthy/software/config/endpoints.yaml
@@ -246,33 +246,6 @@ data:
246 default: null 246 default: null
247 public: 247 public:
248 host: shipyard.DOMAIN 248 host: shipyard.DOMAIN
249 airflow_web:
250 name: airflow-web
251 hosts:
252 default: airflow-web-int
253 public: airflow-web
254 port:
255 airflow_web:
256 default: 8080
257 path:
258 default: /
259 scheme:
260 default: "http"
261 host_fqdn_override:
262 default: null
263 airflow_flower:
264 name: airflow-flower
265 hosts:
266 default: airflow-flower
267 port:
268 airflow_flower:
269 default: 5555
270 path:
271 default: /
272 scheme:
273 default: "http"
274 host_fqdn_override:
275 default: null
276 prometheus_openstack_exporter: 249 prometheus_openstack_exporter:
277 namespace: ucp 250 namespace: ucp
278 hosts: 251 hosts:
diff --git a/site/airskiff/networks/common-addresses.yaml b/site/airskiff/networks/common-addresses.yaml
index 89ea4f0..9effa5f 100644
--- a/site/airskiff/networks/common-addresses.yaml
+++ b/site/airskiff/networks/common-addresses.yaml
@@ -100,8 +100,6 @@ data:
100 drydock_api: 30000 100 drydock_api: 30000
101 maas_api: 30001 101 maas_api: 30001
102 maas_proxy: 31800 # hardcoded in MAAS 102 maas_proxy: 31800 # hardcoded in MAAS
103 shipyard_api: 30003
104 airflow_web: 30004
105 103
106 ntp: 104 ntp:
107 # comma separated NTP server list. Verify that these upstream NTP servers 105 # comma separated NTP server list. Verify that these upstream NTP servers
diff --git a/site/airskiff/software/config/endpoints.yaml b/site/airskiff/software/config/endpoints.yaml
index f73af31..58f8b4e 100644
--- a/site/airskiff/software/config/endpoints.yaml
+++ b/site/airskiff/software/config/endpoints.yaml
@@ -243,33 +243,6 @@ data:
243 default: null 243 default: null
244 public: 244 public:
245 host: shipyard.DOMAIN 245 host: shipyard.DOMAIN
246 airflow_web:
247 name: airflow-web
248 hosts:
249 default: airflow-web-int
250 public: airflow-web
251 port:
252 airflow_web:
253 default: 8080
254 path:
255 default: /
256 scheme:
257 default: "http"
258 host_fqdn_override:
259 default: null
260 airflow_flower:
261 name: airflow-flower
262 hosts:
263 default: airflow-flower
264 port:
265 airflow_flower:
266 default: 5555
267 path:
268 default: /
269 scheme:
270 default: "http"
271 host_fqdn_override:
272 default: null
273 prometheus_openstack_exporter: 246 prometheus_openstack_exporter:
274 namespace: ucp 247 namespace: ucp
275 hosts: 248 hosts: