Fix endpoint names for glance and cinder

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
Bogdan Dobrelya 2015-09-02 16:09:38 +02:00
parent cb2095f39c
commit 1d477b4e05

View File

@ -307,7 +307,7 @@ def setup_resources():
'adminurl': 'http://{{admin_ip}}:{{admin_port}}/v2/%(tenant_id)s', 'adminurl': 'http://{{admin_ip}}:{{admin_port}}/v2/%(tenant_id)s',
'internalurl': 'http://{{internal_ip}}:{{internal_port}}/v2/%(tenant_id)s', 'internalurl': 'http://{{internal_ip}}:{{internal_port}}/v2/%(tenant_id)s',
'publicurl': 'http://{{public_ip}}:{{public_port}}/v2/%(tenant_id)s', 'publicurl': 'http://{{public_ip}}:{{public_port}}/v2/%(tenant_id)s',
'description': 'OpenStack Block Storage Service', 'type': 'volume'})[0] 'description': 'OpenStack Block Storage Service', 'type': 'volumev2'})[0]
signals.connect(node1, cinder_puppet) signals.connect(node1, cinder_puppet)
signals.connect(node1, cinder_db) signals.connect(node1, cinder_db)
@ -507,7 +507,7 @@ def setup_resources():
'adminurl': 'http://{{admin_ip}}:{{admin_port}}', 'adminurl': 'http://{{admin_ip}}:{{admin_port}}',
'internalurl': 'http://{{internal_ip}}:{{internal_port}}', 'internalurl': 'http://{{internal_ip}}:{{internal_port}}',
'publicurl': 'http://{{public_ip}}:{{public_port}}', 'publicurl': 'http://{{public_ip}}:{{public_port}}',
'description': 'OpenStack Image Service', 'type': 'volume'})[0] 'description': 'OpenStack Image Service', 'type': 'image'})[0]
signals.connect(node1, glance_api_puppet) signals.connect(node1, glance_api_puppet)
signals.connect(node1, glance_db) signals.connect(node1, glance_db)