Browse Source

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
Bryan Strassner 3 months ago
parent
commit
5d8e6b28ae

+ 1
- 1
global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml View File

@@ -30,7 +30,7 @@ metadata:
30 30
         name: osh_infra_endpoints
31 31
         path: .osh_infra.oslo_db
32 32
       dest:
33
-        path: .values.endpoints.olso_db
33
+        path: .values.endpoints.oslo_db
34 34
     - src:
35 35
         schema: pegleg/EndpointCatalogue/v1
36 36
         name: osh_infra_endpoints

+ 1
- 1
global/software/charts/osh/openstack-mariadb/mariadb.yaml View File

@@ -33,7 +33,7 @@ metadata:
33 33
         name: osh_endpoints
34 34
         path: .osh.oslo_db
35 35
       dest:
36
-        path: .values.endpoints.olso_db
36
+        path: .values.endpoints.oslo_db
37 37
     - src:
38 38
         schema: pegleg/EndpointCatalogue/v1
39 39
         name: osh_endpoints

+ 1
- 1
global/software/charts/ucp/core/mariadb.yaml View File

@@ -32,7 +32,7 @@ metadata:
32 32
         name: ucp_endpoints
33 33
         path: .ucp.oslo_db
34 34
       dest:
35
-        path: .values.endpoints.olso_db
35
+        path: .values.endpoints.oslo_db
36 36
     # Accounts
37 37
     - src:
38 38
         schema: pegleg/AccountCatalogue/v1

+ 2
- 2
global/software/charts/ucp/shipyard/shipyard.yaml View File

@@ -86,9 +86,9 @@ metadata:
86 86
     - src:
87 87
         schema: pegleg/EndpointCatalogue/v1
88 88
         name: ucp_endpoints
89
-        path: .ucp.oslo_messaging
89
+        path: .ucp.airflow_oslo_messaging
90 90
       dest:
91
-        path: .values.endpoints.olso_messaging
91
+        path: .values.endpoints.oslo_messaging
92 92
     - src:
93 93
         schema: pegleg/EndpointCatalogue/v1
94 94
         name: ucp_endpoints

+ 13
- 0
site/airship-seaworthy/software/config/endpoints.yaml View File

@@ -154,6 +154,19 @@ data:
154 154
         api:
155 155
           default: 9311
156 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 170
     oslo_messaging:
158 171
       namespace: null
159 172
       hosts:

+ 13
- 0
site/airskiff/software/config/endpoints.yaml View File

@@ -151,6 +151,19 @@ data:
151 151
         api:
152 152
           default: 9311
153 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 167
     oslo_messaging:
155 168
       namespace: null
156 169
       hosts:

Loading…
Cancel
Save