Merge "Add openstack_node_role parameter"