Merge "Don't modify case of role names in inventory"
This commit is contained in:
commit
7c28e26de4
|
@ -149,8 +149,8 @@ class TripleoInventory(object):
|
|||
if hostnames:
|
||||
names = hostnames.get(HOST_NETWORK) or []
|
||||
shortnames = [n.split(".%s." % HOST_NETWORK)[0] for n in names]
|
||||
children.append(role.lower())
|
||||
ret[role.lower()] = {
|
||||
children.append(role)
|
||||
ret[role] = {
|
||||
'children': sorted(shortnames),
|
||||
'vars': {
|
||||
'ansible_ssh_user': 'heat-admin',
|
||||
|
@ -177,8 +177,8 @@ class TripleoInventory(object):
|
|||
roles_by_service = self.get_roles_by_service(
|
||||
self.stack_outputs.get('EnabledServices', {}))
|
||||
for service, roles in roles_by_service.items():
|
||||
service_children = [role.lower() for role in roles
|
||||
if ret.get(role.lower()) is not None]
|
||||
service_children = [role for role in roles
|
||||
if ret.get(role) is not None]
|
||||
if service_children:
|
||||
ret[service.lower()] = {
|
||||
'children': service_children,
|
||||
|
|
|
@ -166,12 +166,12 @@ class TestInventory(base.TestCase):
|
|||
'vars': {'deploy_server_id': 'b'}},
|
||||
'c-2': {'hosts': ['x.x.x.3'],
|
||||
'vars': {'deploy_server_id': 'c'}},
|
||||
'compute': {
|
||||
'Compute': {
|
||||
'children': ['cp-0'],
|
||||
'vars': {'ansible_ssh_user': 'heat-admin',
|
||||
'bootstrap_server_id': 'a',
|
||||
'role_name': 'Compute'}},
|
||||
'controller': {
|
||||
'Controller': {
|
||||
'children': ['c-0', 'c-1', 'c-2'],
|
||||
'vars': {'ansible_ssh_user': 'heat-admin',
|
||||
'bootstrap_server_id': 'a',
|
||||
|
@ -180,13 +180,13 @@ class TestInventory(base.TestCase):
|
|||
'vars': {'deploy_server_id': 'd'}},
|
||||
'cs-0': {'hosts': ['z.z.z.1'],
|
||||
'vars': {'deploy_server_id': 'e'}},
|
||||
'customrole': {
|
||||
'CustomRole': {
|
||||
'children': ['cs-0'],
|
||||
'vars': {'ansible_ssh_user': 'heat-admin',
|
||||
'bootstrap_server_id': 'a',
|
||||
'role_name': 'CustomRole'}},
|
||||
'overcloud': {
|
||||
'children': ['compute', 'controller', 'customrole']},
|
||||
'children': ['Compute', 'Controller', 'CustomRole']},
|
||||
'undercloud': {
|
||||
'hosts': ['localhost'],
|
||||
'vars': {'ansible_connection': 'local',
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
- hosts: controller
|
||||
- hosts: Controller
|
||||
vars:
|
||||
metadata:
|
||||
name: Check the status of the ceph cluster
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
- hosts: undercloud, controller
|
||||
- hosts: undercloud, Controller
|
||||
vars:
|
||||
metadata:
|
||||
Name: Verify that keystone admin token is disabled.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
- hosts: controller
|
||||
- hosts: Controller
|
||||
vars:
|
||||
metadata:
|
||||
name: Check controller ulimits
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
- hosts: controller
|
||||
- hosts: Controller
|
||||
vars:
|
||||
metadata:
|
||||
name: HAProxy configuration
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
- hosts: controller
|
||||
- hosts: Controller
|
||||
vars:
|
||||
metadata:
|
||||
name: MySQL Open Files Limit
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
- hosts: controller
|
||||
- hosts: Controller
|
||||
vars:
|
||||
metadata:
|
||||
name: Neutron Sanity Check
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
- hosts: compute
|
||||
- hosts: Compute
|
||||
vars:
|
||||
metadata:
|
||||
name: Verify NoOpFirewallDriver is set in Nova
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
- hosts: controller
|
||||
- hosts: Controller
|
||||
vars:
|
||||
metadata:
|
||||
name: Check the status of the pacemaker cluster
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
- hosts: controller
|
||||
- hosts: Controller
|
||||
vars:
|
||||
metadata:
|
||||
name: Rabbitmq limits
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
- name: Validate stonith devices
|
||||
hosts: controller
|
||||
hosts: Controller
|
||||
vars:
|
||||
metadata:
|
||||
name: stonith-exists
|
||||
|
|
Loading…
Reference in New Issue