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: I5721390b49115ebb367dc6c9a964aebe6a523de0
changes/98/630398/3
Bryan Strassner 4 months ago
parent
commit
ad53fbf5c3

+ 1
- 1
deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml View File

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

+ 2
- 2
deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml View File

@@ -78,9 +78,9 @@ metadata:
78 78
     - src:
79 79
         schema: pegleg/EndpointCatalogue/v1
80 80
         name: ucp_endpoints
81
-        path: .ucp.oslo_messaging
81
+        path: .ucp.airflow_oslo_messaging
82 82
       dest:
83
-        path: .values.endpoints.olso_messaging
83
+        path: .values.endpoints.oslo_messaging
84 84
     - src:
85 85
         schema: pegleg/EndpointCatalogue/v1
86 86
         name: ucp_endpoints

+ 13
- 0
deployment_files/global/v1.0demo/software/config/endpoints.yaml View File

@@ -94,6 +94,19 @@ data:
94 94
         api:
95 95
           default: 9311
96 96
           public: 80
97
+    airflow_oslo_messaging:
98
+      namespace: null
99
+      hosts:
100
+        default: rabbitmq
101
+      host_fqdn_override:
102
+        default: null
103
+      path: /airflow
104
+      scheme: amqp
105
+      port:
106
+        amqp:
107
+          default: 5672
108
+        http:
109
+          default: 15672
97 110
     oslo_messaging:
98 111
       namespace: null
99 112
       hosts:

+ 1
- 1
deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml View File

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

+ 2
- 2
deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml View File

@@ -78,9 +78,9 @@ metadata:
78 78
     - src:
79 79
         schema: pegleg/EndpointCatalogue/v1
80 80
         name: ucp_endpoints
81
-        path: .ucp.oslo_messaging
81
+        path: .ucp.airflow_oslo_messaging
82 82
       dest:
83
-        path: .values.endpoints.olso_messaging
83
+        path: .values.endpoints.oslo_messaging
84 84
     - src:
85 85
         schema: pegleg/EndpointCatalogue/v1
86 86
         name: ucp_endpoints

+ 13
- 0
deployment_files/global/v1.0dev/software/config/endpoints.yaml View File

@@ -92,6 +92,19 @@ data:
92 92
         api:
93 93
           default: 9311
94 94
           public: 80
95
+    airflow_oslo_messaging:
96
+      namespace: null
97
+      hosts:
98
+        default: rabbitmq
99
+      host_fqdn_override:
100
+        default: null
101
+      path: /airflow
102
+      scheme: amqp
103
+      port:
104
+        amqp:
105
+          default: 5672
106
+        http:
107
+          default: 15672
95 108
     oslo_messaging:
96 109
       namespace: null
97 110
       hosts:

Loading…
Cancel
Save