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
This commit is contained in:
Bryan Strassner 2019-01-11 15:52:51 -06:00
parent 58f33ddc5c
commit ad53fbf5c3
6 changed files with 32 additions and 6 deletions

View File

@ -30,7 +30,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

@ -78,9 +78,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

@ -94,6 +94,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

@ -30,7 +30,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

@ -78,9 +78,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

@ -92,6 +92,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: