summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Strassner <strassner.bryan@gmail.com>2019-01-11 15:52:51 -0600
committerBryan Strassner <strassner.bryan@gmail.com>2019-02-22 22:43:30 +0000
commitad53fbf5c312929e8d0873e5095c5a0d1dcdd7f5 (patch)
tree26824d3e711caf4e73d0b4626600d9f4d71b7afa
parent58f33ddc5c7b256502f1ef9cf2b7e74626c4e2f4 (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: I5721390b49115ebb367dc6c9a964aebe6a523de0
Notes
Notes (review): Code-Review+2: Roman Gorshunov <roman.gorshunov@att.com> Code-Review+1: Nishant Kumar <nishant.e.kumar@ericsson.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, 27 Feb 2019 01:11:32 +0000 Reviewed-on: https://review.openstack.org/630398 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml2
-rw-r--r--deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml4
-rw-r--r--deployment_files/global/v1.0demo/software/config/endpoints.yaml13
-rw-r--r--deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml2
-rw-r--r--deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml4
-rw-r--r--deployment_files/global/v1.0dev/software/config/endpoints.yaml13
6 files changed, 32 insertions, 6 deletions
diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml
index e938b70..82be284 100644
--- a/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml
@@ -30,7 +30,7 @@ metadata:
30 name: ucp_endpoints 30 name: ucp_endpoints
31 path: .ucp.oslo_db 31 path: .ucp.oslo_db
32 dest: 32 dest:
33 path: .values.endpoints.olso_db 33 path: .values.endpoints.oslo_db
34 # Accounts 34 # Accounts
35 - src: 35 - src:
36 schema: pegleg/AccountCatalogue/v1 36 schema: pegleg/AccountCatalogue/v1
diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml
index 5254acd..4983da1 100644
--- a/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml
@@ -78,9 +78,9 @@ metadata:
78 - src: 78 - src:
79 schema: pegleg/EndpointCatalogue/v1 79 schema: pegleg/EndpointCatalogue/v1
80 name: ucp_endpoints 80 name: ucp_endpoints
81 path: .ucp.oslo_messaging 81 path: .ucp.airflow_oslo_messaging
82 dest: 82 dest:
83 path: .values.endpoints.olso_messaging 83 path: .values.endpoints.oslo_messaging
84 - src: 84 - src:
85 schema: pegleg/EndpointCatalogue/v1 85 schema: pegleg/EndpointCatalogue/v1
86 name: ucp_endpoints 86 name: ucp_endpoints
diff --git a/deployment_files/global/v1.0demo/software/config/endpoints.yaml b/deployment_files/global/v1.0demo/software/config/endpoints.yaml
index d6cbf1b..7f4d878 100644
--- a/deployment_files/global/v1.0demo/software/config/endpoints.yaml
+++ b/deployment_files/global/v1.0demo/software/config/endpoints.yaml
@@ -94,6 +94,19 @@ data:
94 api: 94 api:
95 default: 9311 95 default: 9311
96 public: 80 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 oslo_messaging: 110 oslo_messaging:
98 namespace: null 111 namespace: null
99 hosts: 112 hosts:
diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml
index ff6bb45..6b48c7d 100644
--- a/deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml
+++ b/deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml
@@ -30,7 +30,7 @@ metadata:
30 name: ucp_endpoints 30 name: ucp_endpoints
31 path: .ucp.oslo_db 31 path: .ucp.oslo_db
32 dest: 32 dest:
33 path: .values.endpoints.olso_db 33 path: .values.endpoints.oslo_db
34 # Accounts 34 # Accounts
35 - src: 35 - src:
36 schema: pegleg/AccountCatalogue/v1 36 schema: pegleg/AccountCatalogue/v1
diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml
index 5254acd..4983da1 100644
--- a/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml
+++ b/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml
@@ -78,9 +78,9 @@ metadata:
78 - src: 78 - src:
79 schema: pegleg/EndpointCatalogue/v1 79 schema: pegleg/EndpointCatalogue/v1
80 name: ucp_endpoints 80 name: ucp_endpoints
81 path: .ucp.oslo_messaging 81 path: .ucp.airflow_oslo_messaging
82 dest: 82 dest:
83 path: .values.endpoints.olso_messaging 83 path: .values.endpoints.oslo_messaging
84 - src: 84 - src:
85 schema: pegleg/EndpointCatalogue/v1 85 schema: pegleg/EndpointCatalogue/v1
86 name: ucp_endpoints 86 name: ucp_endpoints
diff --git a/deployment_files/global/v1.0dev/software/config/endpoints.yaml b/deployment_files/global/v1.0dev/software/config/endpoints.yaml
index 5cf471b..072a8f4 100644
--- a/deployment_files/global/v1.0dev/software/config/endpoints.yaml
+++ b/deployment_files/global/v1.0dev/software/config/endpoints.yaml
@@ -92,6 +92,19 @@ data:
92 api: 92 api:
93 default: 9311 93 default: 9311
94 public: 80 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 oslo_messaging: 108 oslo_messaging:
96 namespace: null 109 namespace: null
97 hosts: 110 hosts: