Merge "Change scheme/port to template instead of getting from hiera"

This commit is contained in:
Zuul 2019-03-25 14:05:57 +00:00 committed by Gerrit Code Review
commit ccb5ff610f
1 changed files with 6 additions and 4 deletions

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}'