openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fetch scheme/port from hiera instead of hard coding it"

This commit is contained in:
Zuul 2019-01-18 01:37:42 +00:00 committed by Gerrit Code Review
parent f228e94efa 632a184a94
commit a263ac7609
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/services/nova-api.yaml
View File

@ -238,14 +238,14 @@ outputs:
TRANSPORTURL:
list_join:
- ''
- - 'rabbit'
- - '$(hiera -c /etc/puppet/hiera.yaml oslo_messaging_rpc_scheme rabbit)'
- '://'
- '{username}'
- ':'
- '{password}'
- '@'
- '{hostname}'
- ':5672'
- ':$(hiera -c /etc/puppet/hiera.yaml oslo_messaging_rpc_port 5672)'
- '/'
- '?'
- '{query}'
@ -493,7 +493,7 @@ outputs:
- name: Setup cell_v2 (map cell0)
shell:
str_replace:
template: nova-manage cell_v2 map_cell0 --database_connection='CELL0DB' --transport-url='TRANSPORTURL'
template: nova-manage cell_v2 map_cell0 --database_connection='CELL0DB' --transport-url="'TRANSPORTURL'"
params:
CELL0DB:
list_join:
@ -516,14 +516,14 @@ outputs:
TRANSPORTURL:
list_join:
- ''
- - 'rabbit'
- - '$(hiera -c /etc/puppet/hiera.yaml oslo_messaging_rpc_scheme rabbit)'
- '://'
- '{username}'
- ':'
- '{password}'
- '@'
- '{hostname}'
- ':5672'
- ':$(hiera -c /etc/puppet/hiera.yaml oslo_messaging_rpc_port 5672)'
- '/'
- '?'
- '{query}'