x/solar
Code Issues Proposed changes

HAProxy config listen_port name fix

Browse Source
This commit is contained in:
Przemyslaw Kaminski 2015-04-22 10:14:00 +02:00
parent f18971c092
commit 8b2e7259ca
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
haproxy_deployment/haproxy-deployment.yaml
View File

@ -72,7 +72,7 @@ resources:
model: x/resources/haproxy_config/ model: x/resources/haproxy_config/
args: args:
servers: {} servers: {}
port: 5000 listen_port: 5000
ports: {} ports: {}
ssh_user: ssh_user:
ssh_key: ssh_key:
@ -113,7 +113,7 @@ resources:
model: x/resources/haproxy_config/ model: x/resources/haproxy_config/
args: args:
servers: {} servers: {}
port: 8774 listen_port: 8774
ports: {} ports: {}
ssh_user: ssh_user:
ssh_key: ssh_key:
@ -185,13 +185,13 @@ connections:
- emitter: haproxy_keystone_config - emitter: haproxy_keystone_config
receiver: haproxy-config receiver: haproxy-config
mapping: mapping:
port: listen_ports listen_port: listen_ports
ports: configs_ports ports: configs_ports
servers: configs servers: configs
- emitter: haproxy_nova_config - emitter: haproxy_nova_config
receiver: haproxy-config receiver: haproxy-config
mapping: mapping:
port: listen_ports listen_port: listen_ports
ports: configs_ports ports: configs_ports
servers: configs servers: configs

4
haproxy_deployment/haproxy_deployment.py
View File

@ -89,8 +89,8 @@ class TestHAProxyDeployment(unittest.TestCase):
self.assertDictEqual( self.assertDictEqual(
haproxy_config.args['listen_ports'], haproxy_config.args['listen_ports'],
{ {
'haproxy_keystone_config': haproxy_keystone_config.args['port'], 'haproxy_keystone_config': haproxy_keystone_config.args['listen_port'],
'haproxy_nova_config': haproxy_nova_config.args['port'], 'haproxy_nova_config': haproxy_nova_config.args['listen_port'],
} }
) )
self.assertDictEqual( self.assertDictEqual(

2
x/resources/haproxy_config/meta.yaml
View File

@ -2,7 +2,7 @@ id: haproxy_config
handler: ansible handler: ansible
version: 1.0.0 version: 1.0.0
input: input:
port: listen_port:
ports: ports:
servers: servers:
input-types: input-types: