openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Change scheme/port to template instead of getting from hiera 

In https://review.openstack.org/631227 we had to fetch scheme/port
from hiera. Since https://bugs.launchpad.net/nova/+bug/1812196 in
nova is now fixed we could revert back to template those.

Change-Id: Ifebcd154b46dd78139c05d793d5593d87300c11b
Related-Bug: #1811004
This commit is contained in:
Martin Schuppert 2019-03-20 11:55:52 +01:00
parent 1fc250e4dc
commit f441b25be2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/nova/nova-api-container-puppet.yaml
View File

@ -340,14 +340,15 @@ outputs:
TRANSPORTURL:
list_join:
- ''
- - '$(hiera -c /etc/puppet/hiera.yaml oslo_messaging_rpc_scheme rabbit)'
- - '{scheme}'
- '://'
- '{username}'
- ':'
- '{password}'
- '@'
- '{hostname}'
- ':$(hiera -c /etc/puppet/hiera.yaml oslo_messaging_rpc_port 5672)'
- ':'
- '{port}'
- '/'
- '?'
- '{query}'
@ -578,14 +579,15 @@ outputs:
TRANSPORTURL:
list_join:
- ''
- - '$(hiera -c /etc/puppet/hiera.yaml oslo_messaging_rpc_scheme rabbit)'
- - '{scheme}'
- '://'
- '{username}'
- ':'
- '{password}'
- '@'
- '{hostname}'
- ':$(hiera -c /etc/puppet/hiera.yaml oslo_messaging_rpc_port 5672)'
- ':'
- '{port}'
- '/'
- '?'
- '{query}'