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
This commit is contained in:
Bryan Strassner 2019-01-11 15:58:57 -06:00 committed by Drew Walters
parent 6e7dc091a1
commit 5d8e6b28ae
6 changed files with 31 additions and 5 deletions

View File

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

View File

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

View File

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

View File

@ -86,9 +86,9 @@ metadata:
- src:
schema: pegleg/EndpointCatalogue/v1
name: ucp_endpoints
path: .ucp.oslo_messaging
path: .ucp.airflow_oslo_messaging
dest:
path: .values.endpoints.olso_messaging
path: .values.endpoints.oslo_messaging
- src:
schema: pegleg/EndpointCatalogue/v1
name: ucp_endpoints

View File

@ -154,6 +154,19 @@ data:
api:
default: 9311
public: 80
airflow_oslo_messaging:
namespace: null
hosts:
default: rabbitmq
host_fqdn_override:
default: null
path: /airflow
scheme: amqp
port:
amqp:
default: 5672
http:
default: 15672
oslo_messaging:
namespace: null
hosts:

View File

@ -151,6 +151,19 @@ data:
api:
default: 9311
public: 80
airflow_oslo_messaging:
namespace: null
hosts:
default: rabbitmq
host_fqdn_override:
default: null
path: /airflow
scheme: amqp
port:
amqp:
default: 5672
http:
default: 15672
oslo_messaging:
namespace: null
hosts: