summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Strassner <strassner.bryan@gmail.com>2019-01-11 15:58:57 -0600
committerDrew Walters <drewwalters96@gmail.com>2019-01-14 19:29:22 +0000
commit5d8e6b28ae318a6f5927ec632c724b49cde8e5e7 (patch)
tree9f11de1f2b9b0aedfc1d22ab7ae2a942de450a35
parent6e7dc091a10ccae2d8c9a384507c73f2f1e71c19 (diff)
Fix references to olso by correcting them to oslo
Transposed characters in the target replacements in some of the deployment files can lead to unexpected results (mostly that defaults are used instead of overrides) Since defaults were being used before, the endpoint definition needed to be redefined to use the expected scheme (amqp) and path (/airflow) Change-Id: I85a58c7b525e29208957845bf25ffbb0111c8f35
Notes
Notes (review): Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Code-Review+1: Evgeniy L <eli@mirantis.com> Code-Review+1: PRATEEK REDDY DODDA <pd2839@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: Mon, 14 Jan 2019 22:52:10 +0000 Reviewed-on: https://review.openstack.org/630399 Project: openstack/airship-treasuremap Branch: refs/heads/master
-rw-r--r--global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml2
-rw-r--r--global/software/charts/osh/openstack-mariadb/mariadb.yaml2
-rw-r--r--global/software/charts/ucp/core/mariadb.yaml2
-rw-r--r--global/software/charts/ucp/shipyard/shipyard.yaml4
-rw-r--r--site/airship-seaworthy/software/config/endpoints.yaml13
-rw-r--r--site/airskiff/software/config/endpoints.yaml13
6 files changed, 31 insertions, 5 deletions
diff --git a/global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml b/global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml
index 1d90c3c..5ef0ded 100644
--- a/global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml
+++ b/global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml
@@ -30,7 +30,7 @@ metadata:
30 name: osh_infra_endpoints 30 name: osh_infra_endpoints
31 path: .osh_infra.oslo_db 31 path: .osh_infra.oslo_db
32 dest: 32 dest:
33 path: .values.endpoints.olso_db 33 path: .values.endpoints.oslo_db
34 - src: 34 - src:
35 schema: pegleg/EndpointCatalogue/v1 35 schema: pegleg/EndpointCatalogue/v1
36 name: osh_infra_endpoints 36 name: osh_infra_endpoints
diff --git a/global/software/charts/osh/openstack-mariadb/mariadb.yaml b/global/software/charts/osh/openstack-mariadb/mariadb.yaml
index 4a75da2..aa16d67 100644
--- a/global/software/charts/osh/openstack-mariadb/mariadb.yaml
+++ b/global/software/charts/osh/openstack-mariadb/mariadb.yaml
@@ -33,7 +33,7 @@ metadata:
33 name: osh_endpoints 33 name: osh_endpoints
34 path: .osh.oslo_db 34 path: .osh.oslo_db
35 dest: 35 dest:
36 path: .values.endpoints.olso_db 36 path: .values.endpoints.oslo_db
37 - src: 37 - src:
38 schema: pegleg/EndpointCatalogue/v1 38 schema: pegleg/EndpointCatalogue/v1
39 name: osh_endpoints 39 name: osh_endpoints
diff --git a/global/software/charts/ucp/core/mariadb.yaml b/global/software/charts/ucp/core/mariadb.yaml
index 55a5a35..400a99e 100644
--- a/global/software/charts/ucp/core/mariadb.yaml
+++ b/global/software/charts/ucp/core/mariadb.yaml
@@ -32,7 +32,7 @@ metadata:
32 name: ucp_endpoints 32 name: ucp_endpoints
33 path: .ucp.oslo_db 33 path: .ucp.oslo_db
34 dest: 34 dest:
35 path: .values.endpoints.olso_db 35 path: .values.endpoints.oslo_db
36 # Accounts 36 # Accounts
37 - src: 37 - src:
38 schema: pegleg/AccountCatalogue/v1 38 schema: pegleg/AccountCatalogue/v1
diff --git a/global/software/charts/ucp/shipyard/shipyard.yaml b/global/software/charts/ucp/shipyard/shipyard.yaml
index 0ec10ae..88208a7 100644
--- a/global/software/charts/ucp/shipyard/shipyard.yaml
+++ b/global/software/charts/ucp/shipyard/shipyard.yaml
@@ -86,9 +86,9 @@ metadata:
86 - src: 86 - src:
87 schema: pegleg/EndpointCatalogue/v1 87 schema: pegleg/EndpointCatalogue/v1
88 name: ucp_endpoints 88 name: ucp_endpoints
89 path: .ucp.oslo_messaging 89 path: .ucp.airflow_oslo_messaging
90 dest: 90 dest:
91 path: .values.endpoints.olso_messaging 91 path: .values.endpoints.oslo_messaging
92 - src: 92 - src:
93 schema: pegleg/EndpointCatalogue/v1 93 schema: pegleg/EndpointCatalogue/v1
94 name: ucp_endpoints 94 name: ucp_endpoints
diff --git a/site/airship-seaworthy/software/config/endpoints.yaml b/site/airship-seaworthy/software/config/endpoints.yaml
index eb084db..63eb2a7 100644
--- a/site/airship-seaworthy/software/config/endpoints.yaml
+++ b/site/airship-seaworthy/software/config/endpoints.yaml
@@ -154,6 +154,19 @@ data:
154 api: 154 api:
155 default: 9311 155 default: 9311
156 public: 80 156 public: 80
157 airflow_oslo_messaging:
158 namespace: null
159 hosts:
160 default: rabbitmq
161 host_fqdn_override:
162 default: null
163 path: /airflow
164 scheme: amqp
165 port:
166 amqp:
167 default: 5672
168 http:
169 default: 15672
157 oslo_messaging: 170 oslo_messaging:
158 namespace: null 171 namespace: null
159 hosts: 172 hosts:
diff --git a/site/airskiff/software/config/endpoints.yaml b/site/airskiff/software/config/endpoints.yaml
index 0e34f77..f73af31 100644
--- a/site/airskiff/software/config/endpoints.yaml
+++ b/site/airskiff/software/config/endpoints.yaml
@@ -151,6 +151,19 @@ data:
151 api: 151 api:
152 default: 9311 152 default: 9311
153 public: 80 153 public: 80
154 airflow_oslo_messaging:
155 namespace: null
156 hosts:
157 default: rabbitmq
158 host_fqdn_override:
159 default: null
160 path: /airflow
161 scheme: amqp
162 port:
163 amqp:
164 default: 5672
165 http:
166 default: 15672
154 oslo_messaging: 167 oslo_messaging:
155 namespace: null 168 namespace: null
156 hosts: 169 hosts: